ckeditor 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d6e5ef0ffcd85208e9967eff65d4e2806ff52c
-  data.tar.gz: fc3e3ca42567885c35a1309a9484f3a6f4b91566
+  metadata.gz: 5eabd9522c6e41cc16b578e752c34cb931454a92
+  data.tar.gz: c11df316e009cde1dcef7c0046ee8db5ab08bdbe
 SHA512:
-  metadata.gz: 919f1f59cd67acacfde54f07eb72fa9d4869ea26b98f2e5a3f22a7e3b0e481787e1ab0763aaccbc4ea177727b727e675485e137689e115a14eb22ceba926f7bf
-  data.tar.gz: 8d50d48d082eaec29ba500c2c426f3b9e8eab36dc50ca0cbd2794b60a8623bac2ef233903619ad4a10ebb730d7e7e6d4296995a20901c7bf660e6f048bccb45d
+  metadata.gz: ba3eab2c3f744e674b0569974f4cab7832c1c64d5927f25d1d3155dc13160d78d0610966c16661b9d422c4bc84c7eeb28b49cad85168571689f5a9e18e20eb04
+  data.tar.gz: 1d01d18849af4afcb915182b1caf1d4fc2df8159001ceceed5e72c597e6a62943c45abe81254f19a7948768d8f2347a475444c3af0d37e48ed8fd44e50ab03a7

data/README.md

@@ -8,7 +8,7 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It
 
 ## Features
 
-* Ckeditor version 4.5.5 (full 12 Nov 2015)
+* Ckeditor version 4.5.6 (9 Dec 2015)
 * Rails 4 integration
 * Files browser
 * HTML5 file uploader
@@ -29,14 +29,6 @@ or if you'd like to use the latest version from Github:
 gem 'ckeditor', github: 'galetahub/ckeditor'
 ```
 
-#### Using with ruby 1.8.7
-
-For usage with ruby 1.8.7 you need to specify the gem version:
-
-```
-gem 'ckeditor', '4.0.4'
-```
-
 For file upload support, you must generate the necessary file storage models.
 The currently supported backends are:
 
@@ -73,7 +65,6 @@ gem 'refile-mini_magick'
 rails generate ckeditor:install --orm=active_record --backend=refile
 ```
 
-
 #### ActiveRecord + dragonfly
 
 Requires Dragonfly 1.0 or greater.
@@ -118,24 +109,40 @@ mount Ckeditor::Engine => '/ckeditor'
 
 ## Usage
 
+### Load editor from gem vendor
+
 Include ckeditor javascripts in your `app/assets/javascripts/application.js`:
 
 ```
 //= require ckeditor/init
 ```
 
-Form helpers:
+### Load editor via CKEditor CDN
 
-```erb
-<%= form_for @page do |form| -%>
-  ...
-  <%= form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'} %>
-  ...
-  <%= form.cktext_area :content, :value => 'Default value', :id => 'sometext' %>
-  ...
-  <%= cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'} %>
-  ...
-<% end -%>
+Setup editor version to load (more info here http://cdn.ckeditor.com/)
+
+```ruby
+# in config/initializers/ckeditor.rb
+
+Ckeditor.setup do |config|
+  # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
+  config.cdn_url = "//cdn.ckeditor.com/4.5.6/standard/ckeditor.js"
+end
+```
+
+In view template include ckeditor CDN:
+
+```slim
+= javascript_include_tag Ckeditor.cdn_url
+```
+
+### Form helpers
+
+```slim
+= form_for @page do |form|
+  = form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'}
+  = form.cktext_area :content, :value => 'Default value', :id => 'sometext'  
+  = cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'}
 ```
 
 ### Customize ckeditor
@@ -171,7 +178,7 @@ CKEDITOR.editorConfig = function (config) {
 
 When overriding the default `config.js` file, you must set all configuration options yourself as the bundled `config.js` will not be loaded. To see the default configuration, run `bundle open ckeditor`, copy `app/assets/javascripts/ckeditor/config.js` into your project and customize it to your needs.
 
-### Deployment
+### Deployment (only if you use ckeditor from gem vendor)
 
 For Rails 4, add the following to `config/initializers/assets.rb`:
 
@@ -229,15 +236,15 @@ jQuery sample:
 
 ### Formtastic integration
 
-```erb
-<%= form.input :content, :as => :ckeditor %>
-<%= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => { :height => 400 } } %>
+```slim
+= form.input :content, :as => :ckeditor
+= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => { :height => 400 } }
 ```
 
 ### SimpleForm integration
 
-```erb
-<%= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} } %>
+```slim
+= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} }
 ```
 
 ### CanCan integration

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

@@ -1,4 +1,3 @@
-//= require ckeditor/filebrowser/javascripts/jquery.min.js
 //= require ckeditor/filebrowser/javascripts/jquery.tmpl.min.js
 //= require ckeditor/filebrowser/javascripts/fileuploader.js
 //= require ckeditor/filebrowser/javascripts/jquery.endless-scroll.js

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

@@ -33,65 +33,6 @@ CKEDITOR.editorConfig = function( config )
 
   config.allowedContent = true;
 
-  // 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];
-
-      switch(meta.name) {
-        case "csrf-token":
-          csrf_token = meta.content;
-          break;
-        case "csrf-param":
-          csrf_param = meta.content;
-          break;
-        default:
-          continue;
-      }
-    }
-
-    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']);
-      }
-    }
-  });
-
   // Toolbar groups configuration.
   config.toolbar = [
     { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] },

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 !== 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/views/layouts/ckeditor/application.html.erb

@@ -5,17 +5,18 @@
   <meta name="robots" content="noindex, nofollow">
   <%= csrf_meta_tag %>
   <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
+  <script src="//code.jquery.com/jquery-1.11.3.min.js" type="text/javascript"></script>
 
   <% if assets_pipeline_enabled? -%>
     <%= stylesheet_link_tag "ckeditor/application" %>
     <%= javascript_include_tag "ckeditor/application" %>
   <% else -%>
     <link href="/javascripts/ckeditor/filebrowser/stylesheets/uploader.css" type="text/css" rel="stylesheet">
-    <% ["jquery.js", "jquery.tmpl.js", "fileuploader.js", "rails.js", "application.js"].each do |js| -%>
+    <% ["jquery.tmpl.js", "fileuploader.js", "rails.js", "application.js"].each do |js| -%>
       <script src="/javascripts/ckeditor/filebrowser/javascripts/<%= js %>" type="text/javascript"></script>
     <% end -%>
   <% end -%>
-  
+
   <script type="text/javascript">
     var CKEditorFuncNum = $.QueryString["CKEditorFuncNum"];
     var CKEditorName = $.QueryString["CKEditor"];