glebtv-ckeditor 4.4.7.4 → 4.5.7

data/app/assets/javascripts/ckeditor/config.js.erb

@@ -1,7 +1,7 @@
 CKEDITOR.editorConfig = function( config ) {
   // Define changes to default configuration here. For example:
   config.language = 'ru';
-  
+
   // config.uiColor = '#AADC6E';
   config.skin = 'moono';
 
@@ -28,7 +28,7 @@ CKEDITOR.editorConfig = function( config ) {
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
   config.stylesSet = [];
-  config.extraPlugins = "colorbutton,colordialog,font,magicline,codemirror,mediaembed,stylesheetparser,ipsum,CKCss,wordcount,youtube,map";
+  config.extraPlugins = "colorbutton,colordialog,font,magicline,codemirror,stylesheetparser,loremipsum,CKCss,wordcount,youtube,lineheight";
   config.contentsCss = "<%= stylesheet_path('ckcontent.css') %>";
 
   config.tabSpaces = 2;
@@ -39,64 +39,10 @@ CKEDITOR.editorConfig = function( config ) {
         ['Styles','Format','Font','FontSize', 'TextColor', 'BGColor'],  ['JustifyLeft','JustifyCenter', 'JustifyRight', 'JustifyBlock'],
         '/',
         ['Bold','Italic','Underline'], ['NumberedList','BulletedList','Blockquote'],
-        ['Link','Unlink'], ['Image', 'Flash'],
+        ['Link','Unlink'], ['lineheight'], ['Image', 'Flash'],
         ['Table','HorizontalRule','SpecialChar'], ['Maximize', 'Subscript', 'Superscript'], ['Outdent','Indent', 'ShowBlocks'],
-        ['ipsum', 'CKCss', 'Youtube', 'map']
+        ['loremipsum', 'CKCss', 'Youtube']
     ];
 
   config.font_names = 'Arial/Arial, Helvetica, sans-serif;Times New Roman/Times New Roman, Times, serif;Verdana;TrebuchetMS';
-
-  // Rails CSRF token
-  config.filebrowserParams = function(){
-    var csrf_token, csrf_param, meta,
-        metas = document.getElementsByTagName('meta'),
-        params = new Object();
-
-    for ( var i = 0 ; i < metas.length ; i++ ){
-      meta = metas[i];
-
-      if (meta.name == "csrf-token") {
-          csrf_token = meta.content;                            
-      } else if (meta.name == "csrf-param") {
-          csrf_param = meta.content;                                   
-      }
-    }
-
-    if (csrf_param !== undefined && csrf_token !== undefined) {
-      params[csrf_param] = csrf_token;
-    }
-
-    return params;
-  };
-
-  config.addQueryString = function( url, params ) {
-    var queryString = [];
-
-    if ( !params ) {
-      return url;
-    } else {
-      for ( var i in params )
-        queryString.push( i + "=" + encodeURIComponent( params[ i ] ) );
-    }
-
-    return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" );
-  };
-
-  // Integrate Rails CSRF token into file upload dialogs (link, image, attachment and flash)
-  CKEDITOR.on('dialogDefinition', function(ev) {
-    // Take the dialog name and its definition from the event data.
-    var dialogName = ev.data.name;
-    var dialogDefinition = ev.data.definition;
-    var content, upload;
-
-    if (CKEDITOR.tools.indexOf(['link', 'image', 'attachment', 'flash'], dialogName) > -1) {
-      content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload'));
-      upload = (content == null ? null : content.get('upload'));
-
-      if (upload && upload.filebrowser && upload.filebrowser['params'] === undefined) {
-        upload.filebrowser['params'] = config.filebrowserParams();
-        upload.action = config.addQueryString(upload.action, upload.filebrowser['params']);
-      }
-    }
-  });
-};
+};

data/app/assets/javascripts/ckeditor/config_orig.js

@@ -0,0 +1,58 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+  // Define changes to default configuration here. For example:
+  // config.language = 'fr';
+  // config.uiColor = '#AADC6E';
+
+  /* Filebrowser routes */
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of a script that handles file uploads in the Flash dialog.
+  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
+  config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+  config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+
+  // The location of a script that handles file uploads in the Image dialog.
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+
+  // The location of a script that handles file uploads.
+  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+
+  config.allowedContent = true;
+
+  // Toolbar groups configuration.
+  config.toolbar = [
+    { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] },
+    { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+    // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
+    // { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
+    { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
+    { name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar' ] },
+    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
+    '/',
+    { name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] },
+    { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
+    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] }
+  ];
+
+  config.toolbar_mini = [
+    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
+    { name: 'styles', items: [ 'Font', 'FontSize' ] },
+    { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
+    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
+    { name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'SpecialChar' ] }
+  ];
+};

data/app/assets/javascripts/ckeditor/filebrowser/javascripts/application.js.erb

@@ -11,20 +11,22 @@ $.QueryString = (function(a) {
 })(window.location.search.substr(1).split('&'))
 
 $(document).ready(function(){
-  $("div.gal-item div.gal-inner-holder")
-    .live('mouseover', function(e){
+  var selector = "div.gal-item div.gal-inner-holder";
+
+  $(document)
+    .on('mouseover', selector, function(e){
       $(this).addClass('hover');
     })
-    .live('mouseout', function(e){
+    .on('mouseout', selector, function(e){
       $(this).removeClass('hover');
     })
-    .live('click', function(e){
+    .on('click', selector, function(e){
       var url = $(this).parents('div.gal-item').data('url');
       CKEDITOR.tools.callFunction(CKEditorFuncNum, url);
       window.close();
     });
-  
-  $("div.gal-item a.gal-del").live('ajax:complete', function(xhr, status){
+
+  $(document).on('ajax:complete', "div.gal-item a.gal-del", function(xhr, status){
     $(this).parents('div.gal-item').remove();
   });
 
@@ -49,15 +51,15 @@ qq.FileUploader.instances = new Object();
 qq.FileUploaderInput = function(o){
     // call parent constructor
     qq.FileUploaderBasic.apply(this, arguments);
-    
-    // additional options    
+
+    // additional options
     qq.extend(this._options, {
         element: null,
         // if set, will be used instead of qq-upload-list in template
         listElement: null,
-        
-        template_id: '#fileupload_tmpl',       
-        
+
+        template_id: '#fileupload_tmpl',
+
         classes: {
             // used to get elements from templates
             button: 'fileupload-button',
@@ -65,7 +67,7 @@ qq.FileUploaderInput = function(o){
             dropActive: 'fileupload-drop-area-active',
             list: 'fileupload-list',
             preview: 'fileupload-preview',
-                        
+
             file: 'fileupload-file',
             spinner: 'fileupload-spinner',
             size: 'fileupload-size',
@@ -77,18 +79,18 @@ qq.FileUploaderInput = function(o){
             fail: 'fileupload-fail'
         }
     });
-    // overwrite options with user supplied    
-    qq.extend(this._options, o);       
+    // overwrite options with user supplied
+    qq.extend(this._options, o);
 
     this._element = document.getElementById(this._options.element);
     this._listElement = this._options.listElement || this._find(this._element, 'list');
-    
+
     this._classes = this._options.classes;
-        
-    this._button = this._createUploadButton(this._find(this._element, 'button'));  
-    
+
+    this._button = this._createUploadButton(this._find(this._element, 'button'));
+
     //this._setupDragDrop();
-    
+
     qq.FileUploader.instances[this._element.id] = this;
 };
 
@@ -99,18 +101,18 @@ qq.extend(qq.FileUploaderInput.prototype, {
     /**
      * Gets one of the elements listed in this._options.classes
      **/
-    _find: function(parent, type){                                
-        var element = qq.getByClass(parent, this._options.classes[type])[0];        
+    _find: function(parent, type){
+        var element = qq.getByClass(parent, this._options.classes[type])[0];
         if (!element){
           alert(type);
             throw new Error('element not found ' + type);
         }
-        
+
         return element;
     },
     _setupDragDrop: function(){
         var self = this,
-            dropArea = this._find(this._element, 'drop');                        
+            dropArea = this._find(this._element, 'drop');
 
         var dz = new qq.UploadDropZone({
             element: dropArea,
@@ -122,49 +124,49 @@ qq.extend(qq.FileUploaderInput.prototype, {
                 e.stopPropagation();
             },
             onLeaveNotDescendants: function(e){
-                qq.removeClass(dropArea, self._classes.dropActive);  
+                qq.removeClass(dropArea, self._classes.dropActive);
             },
             onDrop: function(e){
                 dropArea.style.display = 'none';
                 qq.removeClass(dropArea, self._classes.dropActive);
-                self._uploadFileList(e.dataTransfer.files);    
+                self._uploadFileList(e.dataTransfer.files);
             }
         });
-                
+
         dropArea.style.display = 'none';
 
-        qq.attach(document, 'dragenter', function(e){     
-            if (!dz._isValidFileDrag(e)) return; 
-            
-            dropArea.style.display = 'block';            
-        });                 
+        qq.attach(document, 'dragenter', function(e){
+            if (!dz._isValidFileDrag(e)) return;
+
+            dropArea.style.display = 'block';
+        });
         qq.attach(document, 'dragleave', function(e){
-            if (!dz._isValidFileDrag(e)) return;            
-            
+            if (!dz._isValidFileDrag(e)) return;
+
             var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
             // only fire when leaving document out
-            if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){               
-                dropArea.style.display = 'none';                                            
+            if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){
+                dropArea.style.display = 'none';
             }
-        });                
+        });
     },
     _onSubmit: function(id, fileName){
         qq.FileUploaderBasic.prototype._onSubmit.apply(this, arguments);
-        this._addToList(id, fileName);  
+        this._addToList(id, fileName);
     },
     _onProgress: function(id, fileName, loaded, total){
         qq.FileUploaderBasic.prototype._onProgress.apply(this, arguments);
 
         var item = this._getItemByFileId(id);
         var size = this._find(item, 'size');
-        
-        var text; 
+
+        var text;
         if (loaded != total){
             text = Math.round(loaded / total * 100) + '% from ' + this._formatSize(total);
-        } else {                                   
+        } else {
             text = this._formatSize(total);
-        }          
-        
+        }
+
         qq.setText(size, text);
     },
     _onComplete: function(id, fileName, result){
@@ -172,13 +174,13 @@ qq.extend(qq.FileUploaderInput.prototype, {
 
         var item = this._getItemByFileId(id);
         var asset = result.asset ? result.asset : result;
-        
+
         if (asset && asset.id){
             qq.addClass(item, this._classes.success);
-            
+
             asset.size = this._formatSize(asset.size);
-            asset.controller = (asset.type.toLowerCase() == "ckeditor::picture" ? "pictures" : "attachment_files");
-            
+            asset.controller = (asset.type !== undefined && asset.type.toLowerCase() == "ckeditor::picture" ? "pictures" : "attachment_files");
+
             $(item).replaceWith($(this._options.template_id).tmpl(asset));
         } else {
             qq.addClass(item, this._classes.fail);
@@ -189,37 +191,37 @@ qq.extend(qq.FileUploaderInput.prototype, {
           if (this._options.multiple === false) {
             $(this._listElement).empty();
           }
-          
+
           var asset = {
-            id: 0, 
-            filename: this._formatFileName(fileName), 
+            id: 0,
+            filename: this._formatFileName(fileName),
             size: 0,
             format_created_at: '',
             url_content: "#",
             controller: "assets",
             url_thumb: "<%= asset_path('ckeditor/filebrowser/images/preloader.gif') %>"
           };
-          
+
           var item = $(this._options.template_id)
             .tmpl(asset)
             .attr('qqfileid', id)
             .prependTo( this._listElement );
-          
+
           item.find('div.img').addClass('preloader');
-          
+
           this._bindCancelEvent(item);
         }
     },
     _getItemByFileId: function(id){
-        return $(this._listElement).find('div[qqfileid=' + id  +']').get(0); 
+        return $(this._listElement).find('div[qqfileid=' + id  +']').get(0);
     },
     /**
-     * delegate click event for cancel link 
+     * delegate click event for cancel link
      **/
     _bindCancelEvent: function(element){
         var self = this,
-            item = $(element);        
-        
+            item = $(element);
+
         item.find('a.' + this._classes.cancel).bind('click', function(e){
           self._handler.cancel( item.attr('qqfileid') );
           item.remove();

data/app/assets/javascripts/ckeditor/filebrowser/stylesheets/uploader.css.erb

@@ -11,10 +11,12 @@ img {
 	overflow: hidden;
 	padding: 20px;
 }
+.gal-holder .gal-item:first-child {
+    float: left;
+}
 .gal-holder .gal-item {
-	display: block;
-	float: left;
-	width: 150px;
+    display: inline-block;
+    width: 150px;
 	overflow: hidden;
 	position: relative;
 	margin: 0 12px 12px 0;
@@ -26,7 +28,7 @@ img {
 	top: 0;
 }
 .gal-holder .gal-item .gal-del:hover {
-	-moz-opacity: 0.7; 
+	-moz-opacity: 0.7;
 	-khtml-opacity: 0.7;
 	opacity: 0.7;
 }
@@ -85,6 +87,10 @@ img {
 	overflow: hidden;
 	width: 500px;
 }
+.img-name {
+	word-wrap: break-word;
+	width: auto !important;
+}
 .gal-holder .gal-item .gal-inner-holder .img-data .time-size {
 	display: block;
 	overflow: hidden;
@@ -118,5 +124,5 @@ img {
 }
 
 .pagination, .pagination a {
-	display: none;
-}
+    text-decoration: none;
+}