RubyGems - ckeditor - Versions diffs - 4.2.0 → 4.2.1 - Mend

ckeditor 4.2.0 → 4.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (361) hide show

data/app/views/ckeditor/shared/_asset.html.erb CHANGED

@@ -1,20 +1,19 @@
-<%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => image_path(asset.url_content)) do %>
-  <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
-    :title => I18n.t('ckeditor.buttons.delete')),
-          polymorphic_path(asset, :format => :json),
-          :remote => true,
-          :method => :delete,
-          :data => {:confirm => t('ckeditor.confirm_delete')},
-          :class => "fileupload-cancel gal-del" %>
-	<div class="fileupload-file gal-inner-holder">
-		<div class="img"><%= image_tag(asset.url_thumb, :title => asset.filename) %></div>
-		<div class="img-data">
-			<div class="img-name"><%= asset.filename %></div>
-			<div class="time-size">
-				<div class="time"><%= asset.format_created_at %></div>
-				<div class="fileupload-size size"><%= number_to_human_size(asset.size) if asset.size %></div>
-			</div>
-		</div>
-	</div>
+<%= content_tag(:div, id: dom_id(asset), class: "gal-item", data: { url: image_path(asset.url_content) }) do %>
+  <%= link_to '', polymorphic_path(asset, format: :json),
+          remote: true,
+          method: :delete,
+          title: I18n.t('ckeditor.buttons.delete'),
+          data: { confirm: t('ckeditor.confirm_delete') },
+          class: "fileupload-cancel gal-del" %>
+  <div class="fileupload-file gal-inner-holder">
+    <div class="img"><%= image_tag(asset.url_thumb, title: asset.filename) %></div>
+    <div class="img-data">
+      <div class="img-name"><%= asset.filename %></div>
+      <div class="time-size">
+        <div class="time"><%= asset.format_created_at %></div>
+        <div class="fileupload-size size"><%= number_to_human_size(asset.size) if asset.size %></div>
+      </div>
+    </div>
+  </div>
 <% end %>

data/app/views/ckeditor/shared/_asset_tmpl.html.erb CHANGED

@@ -1,22 +1,21 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
-  <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
-    :title => I18n.t('ckeditor.buttons.delete')),
-          "/ckeditor/${controller}/${id}.json",
-          :remote => true,
-          :method => :delete,
-          :data => {:confirm => t('ckeditor.confirm_delete')},
-          :class => "fileupload-cancel gal-del" %>
-	<div class="fileupload-file gal-inner-holder">
-		<div class="img"><img src="${url_thumb}" title="${filename}"></div>
-		<div class="img-data">
-			<div class="img-name">${filename}</div>
-			<div class="time-size">
-				<div class="time">${format_created_at}</div>
-				<div class="fileupload-size size">${size}</div>
-			</div>
-		</div>
-	</div>
+  <%= link_to '', "/ckeditor/${controller}/${id}.json",
+          remote: true,
+          method: :delete,
+          title: I18n.t('ckeditor.buttons.delete'),
+          data: { confirm: t('ckeditor.confirm_delete') },
+          class: "fileupload-cancel gal-del" %>
+  <div class="fileupload-file gal-inner-holder">
+    <div class="img"><img src="${url_thumb}" title="${filename}"></div>
+    <div class="img-data">
+      <div class="img-name">${filename}</div>
+      <div class="time-size">
+        <div class="time">${format_created_at}</div>
+        <div class="fileupload-size size">${size}</div>
+      </div>
+    </div>
+  </div>
 </div>
 </script>

data/app/views/layouts/ckeditor/application.html.erb CHANGED

@@ -4,7 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="robots" content="noindex, nofollow">
   <%= csrf_meta_tag %>
-  <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
+  <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? -%>
@@ -26,6 +26,6 @@
 </head>
 <body>
   <%= yield %>
-  <%= render :partial => 'ckeditor/shared/asset_tmpl' %>
+  <%= render partial: 'ckeditor/shared/asset_tmpl' %>
 </body>
 </html>

data/config/locales/pt-PT.ckeditor.yml CHANGED

@@ -6,4 +6,4 @@
       cancel: "Cancelar"
       upload: "Enviar"
       delete: "Apagar"
-      next: "Next"
+      next: "Próximo"

data/config/locales/pt.ckeditor.yml ADDED

@@ -0,0 +1,9 @@
+pt:
+  ckeditor:
+    page_title: "Gestor de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"
+      next: "Próximo"

data/config/locales/sq.ckeditor.yml ADDED

@@ -0,0 +1,9 @@
+sq:
+  ckeditor:
+    page_title: "Menaxher i dokumenteve CKEditor"
+    confirm_delete: "Fshi dokumentin?"
+    buttons:
+      cancel: "Anullo"
+      upload: "Upload"
+      delete: "Fshi"
+      next: "Tjetër"

data/config/routes.rb CHANGED

@@ -1,4 +1,4 @@
 Ckeditor::Engine.routes.draw do
-  resources :pictures, :only => [:index, :create, :destroy]
-  resources :attachment_files, :only => [:index, :create, :destroy]
+  resources :pictures, only: [:index, :create, :destroy]
+  resources :attachment_files, only: [:index, :create, :destroy]
 end

data/lib/ckeditor.rb CHANGED

@@ -85,7 +85,7 @@ module Ckeditor
   # Url to ckeditor config, used when CDN enabled
   mattr_accessor :js_config_url
-  @@js_config_url = '/assets/ckeditor/config.js'
+  @@js_config_url = 'ckeditor/config.js'
   # Model classes
   @@picture_model = nil
@@ -95,6 +95,10 @@ module Ckeditor
   mattr_accessor :parent_controller
   @@parent_controller = 'ApplicationController'
+  # Configurable controller layout
+  mattr_accessor :controller_layout
+  @@controller_layout = 'ckeditor/application'
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #

data/lib/ckeditor/asset_response.rb CHANGED

@@ -1,5 +1,13 @@
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/javascript_helper'
 module Ckeditor
   class AssetResponse
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::JavaScriptHelper
+    FUNCTION = 'window.parent.CKEDITOR.tools.callFunction'.freeze
     attr_reader :asset, :params
     def initialize(asset, request)
@@ -44,9 +52,7 @@ module Ckeditor
     def success_ckeditor(relative_url_root = nil)
       {
-        text: %"<script type='text/javascript'>
-          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{asset_url(relative_url_root)}');
-        </script>"
+        html: javascript_tag("#{FUNCTION}(#{params[:CKEditorFuncNum]}, '#{asset_url(relative_url_root)}');")
       }
     end
@@ -64,9 +70,7 @@ module Ckeditor
     def errors_ckeditor
       {
-        text: %"<script type='text/javascript'>
-          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{error_message}');
-        </script>"
+        html: javascript_tag("#{FUNCTION}(#{params[:CKEditorFuncNum]}, null, '#{error_message}');")
       }
     end

data/lib/ckeditor/helpers/controllers.rb CHANGED

@@ -13,11 +13,6 @@ module Ckeditor
         instance_exec(&Ckeditor.authorize_with)
       end
-      def ckeditor_before_create_asset(asset)
-        asset.assetable = ckeditor_current_user if ckeditor_current_user
-        true
-      end
       def ckeditor_pictures_scope(options = {})
         ckeditor_filebrowser_scope(options)
       end

data/lib/ckeditor/orm/active_record.rb CHANGED

@@ -13,8 +13,6 @@ module Ckeditor
           def self.extended(base)
             base.class_eval do
               self.table_name = 'ckeditor_assets'
-              belongs_to :assetable, polymorphic: true
             end
           end
         end

data/lib/ckeditor/orm/base.rb CHANGED

@@ -20,7 +20,7 @@ module Ckeditor
           end
           def format_created_at
-            I18n.l(created_at, format: :default)
+            I18n.l(created_at, format: :short)
           end
           def url_content

data/lib/ckeditor/orm/mongoid.rb CHANGED

@@ -30,8 +30,6 @@ module Ckeditor
               field :data_file_size, type: Integer
               field :width, type: Integer
               field :height, type: Integer
-              belongs_to :assetable, polymorphic: true
             end
           end
         end

data/lib/ckeditor/paginatable.rb CHANGED

@@ -16,6 +16,8 @@ module Ckeditor
     def scoped
       @scope.limit(limit_value).offset(offset_value)
     end
+    alias all scoped
+    alias to_a scoped
     # Next page number in the collection
     def next_page

data/lib/ckeditor/rails.rb CHANGED

@@ -28,6 +28,12 @@ module Ckeditor
     rake_tasks do
       load Ckeditor.root_path.join('lib/tasks/ckeditor.rake')
+      if Rake::Task.task_defined?('assets:precompile')
+        Rake::Task['assets:precompile'].enhance do
+          Rake::Task['ckeditor:nondigest'].invoke if Ckeditor.run_on_precompile?
+        end
+      end
     end
   end
 end

data/lib/ckeditor/text_area.rb CHANGED

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
+require 'action_view/helpers/javascript_helper'
 module Ckeditor
   class TextArea
@@ -14,7 +15,7 @@ module Ckeditor
       @template = template
       @options = options.stringify_keys
       @ck_options = (@options.delete('ckeditor') || {}).stringify_keys
-      @ck_options['customConfig'] ||= Ckeditor.js_config_url if Ckeditor.cdn_enabled?
+      @ck_options['customConfig'] ||= template.asset_path(Ckeditor.js_config_url) if Ckeditor.cdn_enabled?
     end
     def render_instance_tag(object_name, method)

data/lib/ckeditor/utils.rb CHANGED

@@ -21,17 +21,23 @@ module Ckeditor
       end
       def js_replace(dom_id, options = nil)
-        js = ["(function() { if (typeof CKEDITOR != 'undefined') {"]
-        if options && !options.keys.empty?
-          js_options = ActiveSupport::JSON.encode(options)
-          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}', #{js_options}); }"
-        else
-          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}'); }"
-        end
+        replace = if options && !options.keys.empty?
+                    js_options = ActiveSupport::JSON.encode(options)
+                    "CKEDITOR.replace('#{dom_id}', #{js_options});"
+                  else
+                    "CKEDITOR.replace('#{dom_id}');"
+                  end
+        js_init_ckeditor(dom_id, replace)
+      end
-        js << '} else { setTimeout(arguments.callee, 50); } })();'
-        js.join.html_safe
+      def js_init_ckeditor(dom_id, replace)
+        %((function() {
+            if (typeof CKEDITOR != 'undefined') {
+              if (CKEDITOR.instances['#{dom_id}']) { CKEDITOR.instances['#{dom_id}'].destroy(); }
+              #{replace}
+            }
+          })();)
       end
       def js_fileuploader(uploader_type, options = {})
@@ -58,11 +64,11 @@ module Ckeditor
       def filethumb(filename)
         extname = filename.blank? ? 'unknown' : File.extname(filename).gsub(/^\./, '')
         image = "#{extname}.gif"
-        source = Ckeditor.root_path.join('app/assets/javascripts/ckeditor/filebrowser/images/thumbs')
+        source = Ckeditor.root_path.join('app/assets/images/ckeditor/filebrowser/thumbs')
         image = 'unknown.gif' unless File.exist?(File.join(source, image))
-        File.join(Ckeditor.relative_path, 'filebrowser/images/thumbs', image)
+        File.join(Ckeditor.relative_path, 'filebrowser/thumbs', image)
       end
       def select_assets(path, relative_path)

data/lib/ckeditor/version.rb CHANGED

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = '4.2.0'.freeze
-    EDITOR = '4.5.10'.freeze
+    GEM = '4.2.1'.freeze
+    EDITOR = '4.6.1'.freeze
   end
 end

data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb CHANGED

@@ -4,9 +4,6 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_file_name, null: false
       t.string  :data_content_type
       t.integer :data_file_size
-      t.integer :assetable_id
-      t.string  :assetable_type, limit: 30
       t.string  :type, limit: 30
       # Uncomment it to save images dimensions, if your need it
@@ -16,8 +13,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.timestamps null: false
     end
-    add_index :ckeditor_assets, [:assetable_type, :type, :assetable_id], name: :idx_ckeditor_assetable_type
-    add_index :ckeditor_assets, [:assetable_type, :assetable_id], name: :idx_ckeditor_assetable
+    add_index :ckeditor_assets, :type
   end
   def self.down

data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb CHANGED

@@ -5,9 +5,6 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_name, null: false
       t.string  :data_mime_type
       t.integer :data_size
-      t.integer :assetable_id
-      t.string  :assetable_type, limit: 30
       t.string  :type, limit: 30
       # Uncomment these to save image dimensions, if your need them.
@@ -17,8 +14,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.timestamps null: false
     end
-    add_index :ckeditor_assets, [:assetable_type, :type, :assetable_id], name: :idx_ckeditor_assetable_type
-    add_index :ckeditor_assets, [:assetable_type, :assetable_id], name: :idx_ckeditor_assetable
+    add_index :ckeditor_assets, :type
   end
   def self.down

data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb CHANGED

@@ -5,8 +5,6 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_content_type
       t.integer :data_file_size
       t.string  :data_fingerprint
-      t.integer :assetable_id
-      t.string  :assetable_type, limit: 30
       t.string  :type, limit: 30
       # Uncomment	it to save images dimensions, if your need it
@@ -16,8 +14,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.timestamps null: false
     end
-    add_index :ckeditor_assets, [:assetable_type, :type, :assetable_id], name: :idx_ckeditor_assetable_type
-    add_index :ckeditor_assets, [:assetable_type, :assetable_id], name: :idx_ckeditor_assetable
+    add_index :ckeditor_assets, :type
   end
   def self.down

data/lib/generators/ckeditor/templates/active_record/refile/migration.rb CHANGED

@@ -5,9 +5,6 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_filename, null: false
       t.integer :data_size
       t.string  :data_content_type
-      t.integer :assetable_id
-      t.string  :assetable_type, limit: 30
       t.string  :type, limit: 30
       # Uncomment it to save images dimensions, if your need it
@@ -17,8 +14,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.timestamps null: false
     end
-    add_index :ckeditor_assets, [:assetable_type, :type, :assetable_id], name: :idx_ckeditor_assetable_type
-    add_index :ckeditor_assets, [:assetable_type, :assetable_id], name: :idx_ckeditor_assetable
+    add_index :ckeditor_assets, :type
   end
   def self.down

data/lib/generators/ckeditor/templates/ckeditor.rb CHANGED

@@ -4,7 +4,7 @@ Ckeditor.setup do |config|
   # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require "ckeditor/orm/<%= options[:orm] %>"
+  require 'ckeditor/orm/<%= options[:orm] %>'
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
@@ -39,7 +39,7 @@ Ckeditor.setup do |config|
   # Customize ckeditor assets path
   # By default: nil
-  # config.asset_path = "http://www.example.com/assets/ckeditor/"
+  # config.asset_path = 'http://www.example.com/assets/ckeditor/'
   # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
   # By default: nil (no limit)
@@ -49,10 +49,10 @@ Ckeditor.setup do |config|
   # CKEditor CDN
   # More info here http://cdn.ckeditor.com/
   # By default: nil (CDN disabled)
-  # config.cdn_url = "//cdn.ckeditor.com/4.5.6/standard/ckeditor.js"
+  # config.cdn_url = '//cdn.ckeditor.com/<%= Ckeditor::Version::EDITOR %>/standard/ckeditor.js'
   # JS config url
   # Used when CKEditor CDN enabled
-  # By default: "/assets/ckeditor/config.js"
-  # config.js_config_url = "/assets/ckeditor/config.js"
+  # By default: "ckeditor/config.js"
+  # config.js_config_url = 'ckeditor/config.js'
 end

data/lib/generators/ckeditor/templates/pundit_policy/attachment_file_policy.rb CHANGED

@@ -15,6 +15,6 @@ class Ckeditor::AttachmentFilePolicy
   end
   def destroy?
-    attachment.assetable_id == user.id
+    user.present?
   end
-end
+end