ckeditor 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba28bfa21d329af77d72bb3f6d787618ea1ba91
-  data.tar.gz: dd4bd4dbcb3bab209666f640bc775b5d331b0ba3
+  metadata.gz: 8c5dde5cbe9a0e8847abdb9d3d8509a631f583f9
+  data.tar.gz: 15db649d134d31ef167ff6d0f6ff76679a551044
 SHA512:
-  metadata.gz: cfd9a557133ffdde4d12ea628dfbfd05de84aeca946de7694b8f1ee021cfb40b4ea724cee62aa1ef2aae5cf0bfa88380f9f325ae9b9c71c22c5db4e3a29ad69c
-  data.tar.gz: b07c84bda9a828f867e2fe524cc45a1ddbb11f7c55765a9162ba235e93bfae29cfca2c08ae9e9cd094672aa678d82619cd5b8de6dc38b5909ffa3930d26d3596
+  metadata.gz: 4e61e5593b87692593387b2e933f0de00fbb4db0b314c4e78ac90383cd505a3cc7ac22610b77f336acb146d60bae2fed2fa255b83a1039196fd3b6e64a712ab2
+  data.tar.gz: bda25df1bf24b3b9c2839cc4e9b5ab10af2fdebd03e6ea77a6a8c4de2faab19bab08371490a8494b793255e275fd30f1360fb00ad5bc3a4296991fc881d2ca88

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rails', '4.2.7'
 
 platforms :ruby do
   gem 'sqlite3'
+  gem 'sass'
 
   group :development do
     gem 'unicorn', '~> 4.0.1'

data/README.md

@@ -1,6 +1,6 @@
 # Ckeditor
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/9c3e4e36-9716-4362-aaa5-ef9644c72313/565007/badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
+[![Build Status](https://semaphoreci.com/api/v1/igor-galeta/ckeditor/branches/master/shields_badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
 [![Code Climate](https://codeclimate.com/github/galetahub/ckeditor/badges/gpa.svg)](https://codeclimate.com/github/galetahub/ckeditor)
 
 CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our community maintained editor.
@@ -8,8 +8,8 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It
 
 ## Features
 
-* Ckeditor version 4.5.10 (13 Jul 2016)
-* Rails 4.2-5 integration
+* Ckeditor version 4.6.1 (08 Dec 2016)
+* Rails 5.0.x, 4.2.x integration
 * Files browser
 * HTML5 file uploader
 * Hooks for formtastic and simple_form forms generators
@@ -29,6 +29,12 @@ or if you'd like to use the latest version from Github:
 gem 'ckeditor', github: 'galetahub/ckeditor'
 ```
 
+The last version works with Rails 3.2.x is 4.1.3
+
+```ruby
+gem 'ckeditor', '4.1.3'
+```
+
 For file upload support, you must generate the necessary file storage models.
 The currently supported backends are:
 
@@ -126,7 +132,7 @@ Setup editor version to load (more info here http://cdn.ckeditor.com/)
 
 Ckeditor.setup do |config|
   # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
-  config.cdn_url = "//cdn.ckeditor.com/4.5.10/standard/ckeditor.js"
+  config.cdn_url = "//cdn.ckeditor.com/4.6.1/basic/ckeditor.js"
 end
 ```
 
@@ -136,6 +142,14 @@ In view template include ckeditor CDN:
 = javascript_include_tag Ckeditor.cdn_url
 ```
 
+Precompile ckeditor/config.js:
+
+```ruby
+# in config/initializers/assets.rb
+
+Rails.application.config.assets.precompile += %w(ckeditor/config.js)
+```
+
 ### Form helpers
 
 ```slim
@@ -247,6 +261,19 @@ jQuery sample:
 = form.input :content, as: :ckeditor, input_html: { ckeditor: { toolbar: 'Full' } }
 ```
 
+### Turbolink integration
+Create a file app/assets/javascripts/init_ckeditor.coffee
+
+```coffee
+ready = ->
+  $('.ckeditor').each ->
+  CKEDITOR.replace $(this).attr('id')
+
+$(document).ready(ready)
+$(document).on('page:load', ready) } }
+```
+Make sure the file is loaded from your app/assets/javascripts/application.js
+
 ### CanCan integration
 
 To use cancan with Ckeditor, add this to an initializer:

data/app/assets/javascripts/ckeditor/filebrowser/javascripts/{application.js.erb → application.js}

@@ -199,15 +199,13 @@ qq.extend(qq.FileUploaderInput.prototype, {
             format_created_at: '',
             url_content: "#",
             controller: "assets",
-            url_thumb: "<%= asset_path('ckeditor/filebrowser/images/preloader.gif') %>"
+            url_thumb: ""
           };
 
-          var item = $(this._options.template_id)
-            .tmpl(asset)
-            .attr('qqfileid', id)
-            .prependTo( this._listElement );
+          var item = $(this._options.template_id).tmpl(asset).attr('qqfileid', id)
 
-          item.find('div.img').addClass('preloader');
+          item.find('div.img').html('').addClass('preloader');
+          item.prependTo( this._listElement );
 
           this._bindCancelEvent(item);
         }

data/app/assets/stylesheets/ckeditor/application.css

@@ -2,5 +2,5 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require ckeditor/filebrowser/stylesheets/uploader.css
+ *= require ckeditor/filebrowser/uploader
 */

data/app/assets/stylesheets/ckeditor/filebrowser/uploader.scss

@@ -0,0 +1,132 @@
+body {
+  padding: 0;
+  margin: 0;
+  font-family: Arial, Helvetica, sans-serif;
+}
+img {
+  border: 0;
+}
+.gal-holder {
+  display: block;
+  overflow: hidden;
+  padding: 20px;
+}
+.gal-holder .gal-item:first-child {
+    float: left;
+}
+.gal-holder .gal-item {
+    display: inline-block;
+    width: 150px;
+  overflow: hidden;
+  position: relative;
+  margin: 0 12px 12px 0;
+}
+.gal-holder .gal-item .gal-del {
+  display: block;
+  position: absolute;
+  right: 0;
+  top: 0;
+  background: url(image_path('ckeditor/filebrowser/gal_del.png')) no-repeat left center;
+  width: 17px;
+  height: 17px;
+}
+.gal-holder .gal-item .preloader {
+  background: url(image_path('ckeditor/filebrowser/preloader.gif')) no-repeat center center;
+  width: 118px;
+  height: 100px;
+}
+.gal-holder .gal-item .gal-del:hover {
+  -moz-opacity: 0.7;
+  -khtml-opacity: 0.7;
+  opacity: 0.7;
+}
+.gal-holder .gal-item .gal-upload-holder input {
+  height: 162px;
+}
+.gal-holder .gal-item .gal-upload-holder .add:hover {
+  text-decoration: underline;
+}
+.gal-holder .gal-item .gal-inner-holder, .gal-holder .gal-item .gal-upload-holder {
+  display: block;
+  margin: 6px 6px 0 0;
+  overflow: hidden;
+  padding: 12px;
+  background: #fff;
+  border: solid 1px #D3D3D3;
+  min-height: 138px;
+}
+.gal-holder .gal-item .gal-inner-holder.hover {
+    background: #DFF1FF;
+    border: solid 1px #99CCFF;
+}
+.gal-holder .gal-item .gal-inner-holder.selected {
+    background: #B4D9FF;
+    border: solid 1px #6565FE;
+}
+.gal-holder .gal-item .gal-upload-holder .add {
+  display: block;
+  color: #2e5aff;
+  background: url(image_path('ckeditor/filebrowser/gal_add.png')) no-repeat left center;
+  padding-left: 33px;
+  line-height: 25px;
+  text-decoration: none;
+  margin: 50px 0 0 10px;
+  font-size: 14px;
+}
+.gal-holder .gal-item .gal-inner-holder .img {
+  height: 100px;
+  overflow: hidden;
+  cursor:pointer;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data {
+  display: block;
+  overflow: hidden;
+  padding-top: 5px;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .img-name {
+  display: block;
+  color: #333;
+  padding-bottom: 5px;
+  font-size: 12px;
+  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;
+  font-size: 10px;
+  color: #666;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .time-size .time {
+  display: block;
+  float: left;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .time-size .size {
+  display: block;
+  float: right;
+}
+.gal-more {
+  display: block;
+  overflow: hidden;
+  border-top: dashed 1px #d3d3d3;
+  padding: 20px 0;
+  text-align: center;
+}
+.gal-more a {
+  color: #2e5aff;
+  background: url(image_path('ckeditor/filebrowser/gal_more.gif')) no-repeat left center;
+  padding-left: 15px;
+  font-size: 14px;
+  text-decoration: none;
+}
+.gal-more a:hover {
+  text-decoration: underline;
+}
+
+.pagination, .pagination a {
+    text-decoration: none;
+}

data/app/controllers/ckeditor/application_controller.rb

@@ -1,20 +1,19 @@
 class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
-  layout 'ckeditor/application'
+  layout Ckeditor.controller_layout
 
-  before_action :find_asset, :only => [:destroy]
+  before_action :find_asset, only: [:destroy]
   before_action :ckeditor_authorize!
   before_action :authorize_resource
 
   protected
 
-    def respond_with_asset(asset)
-      _response = Ckeditor::AssetResponse.new(asset, request)
-      _callback = ckeditor_before_create_asset(asset)
+  def respond_with_asset(asset)
+    asset_response = Ckeditor::AssetResponse.new(asset, request)
 
-      if _callback && asset.save
-        render _response.success(config.relative_url_root)
-      else
-        render _response.errors
-      end
+    if asset.save
+      render asset_response.success(config.relative_url_root)
+    else
+      render asset_response.errors
     end
+  end
 end

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -6,7 +6,7 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
     @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
 
     respond_to do |format|
-      format.html { render :layout => @attachments.first_page? }
+      format.html { render layout: @attachments.first_page? }
     end
   end
 
@@ -20,18 +20,18 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to attachment_files_path }
-      format.json { render :nothing => true, :status => 204 }
+      format.json { render json: @attachment, status: 204 }
     end
   end
 
   protected
 
-    def find_asset
-      @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
-    end
+  def find_asset
+    @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
+  end
 
-    def authorize_resource
-      model = (@attachment || Ckeditor.attachment_file_model)
-      @authorization_adapter.try(:authorize, params[:action], model)
-    end
+  def authorize_resource
+    model = (@attachment || Ckeditor.attachment_file_model)
+    @authorization_adapter.try(:authorize, params[:action], model)
+  end
 end

data/app/controllers/ckeditor/pictures_controller.rb

@@ -6,7 +6,7 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
     @pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
 
     respond_to do |format|
-      format.html { render :layout => @pictures.first_page? }
+      format.html { render layout: @pictures.first_page? }
     end
   end
 
@@ -20,18 +20,18 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to pictures_path }
-      format.json { render :nothing => true, :status => 204 }
+      format.json { render json: @picture, status: 204 }
     end
   end
 
   protected
 
-    def find_asset
-      @picture = Ckeditor.picture_adapter.get!(params[:id])
-    end
+  def find_asset
+    @picture = Ckeditor.picture_adapter.get!(params[:id])
+  end
 
-    def authorize_resource
-      model = (@picture || Ckeditor.picture_model)
-      @authorization_adapter.try(:authorize, params[:action], model)
-    end
+  def authorize_resource
+    model = (@picture || Ckeditor.picture_model)
+    @authorization_adapter.try(:authorize, params[:action], model)
+  end
 end

data/app/views/ckeditor/attachment_files/index.html.erb

@@ -1,17 +1,17 @@
 <div id="fileupload" class="gal-holder">
   <div class="gal-item">
     <div class="fileupload-button gal-upload-holder">
-  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
-		</div>
-	</div>
+      <%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
+    </div>
+  </div>
 
   <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments %>
+    <%= render partial: 'ckeditor/shared/asset', collection: @attachments %>
   </div>
 
   <% unless @attachments.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(:page => @attachments.next_page)), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(page: @attachments.next_page)), class: "next", rel: "next" %>
     </div>
   <% end -%>
 

data/app/views/ckeditor/pictures/index.html.erb

@@ -1,17 +1,17 @@
 <div id="fileupload" class="gal-holder">
   <div class="gal-item">
     <div class="fileupload-button gal-upload-holder">
-  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
-		</div>
-	</div>
+      <%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
+    </div>
+  </div>
 
   <div class="fileupload-list" data-endless="true">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures.scoped %>
+    <%= render partial: 'ckeditor/shared/asset', collection: @pictures.scoped %>
   </div>
 
   <% unless @pictures.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(:page => @pictures.next_page)), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(page: @pictures.next_page)), class: "next", rel: "next" %>
     </div>
   <% end -%>