glebtv-ckeditor 4.4.7.4 → 4.5.7

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

@@ -1,3 +1,8 @@
-//= require ckeditor/override
+//= require_self
 //= require ckeditor/ckeditor
 
+(function() {
+  if (typeof window['CKEDITOR_BASEPATH'] === "undefined" || window['CKEDITOR_BASEPATH'] === null) {
+    window['CKEDITOR_BASEPATH'] = "<%= Ckeditor.base_path %>";
+  }
+}).call(this);

data/app/controllers/ckeditor/application_controller.rb

@@ -1,5 +1,4 @@
-class Ckeditor::ApplicationController < ::ApplicationController
-  respond_to :html, :json
+class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
   layout 'ckeditor/application'
 
   before_filter :find_asset, :only => [:destroy]
@@ -9,23 +8,13 @@ class Ckeditor::ApplicationController < ::ApplicationController
   protected
 
     def respond_with_asset(asset)
-      file = params[:CKEditor].blank? ? params[:qqfile] : params[:upload]
-      asset.data = Ckeditor::Http.normalize_param(file, request)
+      _response = Ckeditor::AssetResponse.new(asset, request)
+      _callback = ckeditor_before_create_asset(asset)
 
-      callback = ckeditor_before_create_asset(asset)
-
-      if callback && asset.save
-        body = params[:CKEditor].blank? ? asset.to_json(:only=>[:id, :type]) : %Q"<script type='text/javascript'>
-          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{config.relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
-        </script>"
-
-        render :text => body
+      if _callback && asset.save
+        render _response.success(config.relative_url_root)
       else
-        if callback
-          render text: "Error: #{asset.errors.full_messages.join(", ")}", status: 422
-        else
-          render text: "Error: callback is false", status: 422
-        end
+        render _response.errors
       end
     end
 end

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,10 +1,13 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
-
+  skip_before_filter :verify_authenticity_token, only: :create
+  
   def index
     @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)
     @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
 
-    respond_with(@attachments, :layout => @attachments.first_page?)
+    respond_to do |format|
+      format.html { render :layout => @attachments.first_page? }
+    end
   end
 
   def create
@@ -14,7 +17,11 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
 
   def destroy
     @attachment.destroy
-    respond_with(@attachment, :location => attachment_files_path)
+
+    respond_to do |format|
+      format.html { redirect_to attachment_files_path }
+      format.json { render :nothing => true, :status => 204 }
+    end
   end
 
   protected

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,10 +1,13 @@
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
+  skip_before_filter :verify_authenticity_token, only: :create
 
   def index
     @pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)
     @pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
 
-    respond_with(@pictures, :layout => @pictures.first_page?)
+    respond_to do |format|
+      format.html { render :layout => @pictures.first_page? }
+    end
   end
 
   def create
@@ -14,7 +17,11 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
 
   def destroy
     @picture.destroy
-    respond_with(@picture, :location => pictures_path)
+
+    respond_to do |format|
+      format.html { redirect_to pictures_path }
+      format.json { render :nothing => true, :status => 204 }
+    end
   end
 
   protected

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

@@ -4,14 +4,14 @@
   		<%= 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.scoped %>		
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>
   </div>
 
   <% unless @attachments.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), 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

@@ -4,14 +4,14 @@
   		<%= 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"), 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 -%>
 

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"];

data/app/views/rails_admin/main/_form_ck_editor.html.haml

@@ -1,7 +1,7 @@
 :ruby
   js_data = {
     :jspath => javascript_path('ckeditor/init'),
-    :base_location => '/ckeditor',
+    :base_location => '/assets/ckeditor/',
     :options => {
       :customConfig => javascript_path('ckeditor/config')
     }

data/app/views/rails_admin/main/_form_ck_editorml.html.haml

@@ -1,7 +1,7 @@
 :ruby
   js_data = {
     :jspath => javascript_path('ckeditor/init'),
-    :base_location => '/ckeditor',
+    :base_location => '/assets/ckeditor/',
     :options => {
       :customConfig => javascript_path('ckeditor/config')
     }

data/config/locales/bg.ckeditor.yml

@@ -0,0 +1,9 @@
+bg:
+  ckeditor:
+    page_title: "Списък с файлове"
+    confirm_delete: "Сигурни ли сте, че искате да изтриете този файл?"
+    buttons:
+      cancel: "Откажи"
+      upload: "Качи"
+      delete: "Изтрий"
+      next: "Следващ"

data/config/locales/ja.ckeditor.yml

@@ -0,0 +1,9 @@
+ja:
+  ckeditor:
+    page_title: "CKEditor ファイル・マネージャー"
+    confirm_delete: "ファイルを削除しますか？"
+    buttons:
+      cancel: "キャンセル"
+      upload: "アップロード"
+      delete: "削除"
+      next: "次へ"

data/config/locales/nb.ckeditor.yml

@@ -0,0 +1,9 @@
+nb:
+  ckeditor:
+    page_title: "CKEditor filbehandlingr"
+    confirm_delete: "Slette filen?"
+    buttons:
+      cancel: "Avbryt"
+      upload: "Last opp"
+      delete: "Slett"
+      next: "Neste"

data/config/locales/tr.ckeditor.yml

@@ -0,0 +1,9 @@
+tr:
+  ckeditor:
+    page_title: "CKEditor Dosya Yöneticisi"
+    confirm_delete: "Dosyayı sil?"
+    buttons:
+      cancel: "İptal"
+      upload: "Yükle"
+      delete: "Sil"
+      next: "Sonraki"

data/config/locales/zh-CN.ckeditor.yml

@@ -6,4 +6,4 @@ zh-CN:
       cancel: "取消"
       upload: "上传"
       delete: "删除"
-      next: "Next"
+      next: "下一个"

data/config/locales/zh-TW.ckeditor.yml

@@ -0,0 +1,9 @@
+zh-TW:
+  ckeditor:
+    page_title: "CKEditor - 文件管理"
+    confirm_delete: "删除文件?"
+    buttons:
+      cancel: "取消"
+      upload: "上傳"
+      delete: "删除"
+      next: "下一個"

data/lib/ckeditor.rb

@@ -6,6 +6,7 @@ module Ckeditor
   autoload :Http, 'ckeditor/http'
   autoload :TextArea, 'ckeditor/text_area'
   autoload :Paginatable, 'ckeditor/paginatable'
+  autoload :AssetResponse, 'ckeditor/asset_response'
 
   module Helpers
     autoload :ViewHelper, 'ckeditor/helpers/view_helper'
@@ -24,6 +25,7 @@ module Ckeditor
     autoload :Paperclip, 'ckeditor/backend/paperclip'
     autoload :CarrierWave, 'ckeditor/backend/carrierwave'
     autoload :Dragonfly, 'ckeditor/backend/dragonfly'
+    autoload :Refile, 'ckeditor/backend/refile'
   end
 
   IMAGE_TYPES = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png)
@@ -44,20 +46,24 @@ module Ckeditor
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf png gif jpg jpeg bmp psd)
+  @@attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
 
   # Ckeditor files destination path
   mattr_accessor :relative_path
-  @@relative_path = '/assets/ckeditor'
+  @@relative_path = 'ckeditor'
 
   # Ckeditor assets path
   mattr_accessor :asset_path
-  @@asset_path = (Rails::VERSION::MAJOR == 4 ? 'assets/ckeditor' : 'ckeditor')
+  @@asset_path = nil
 
   # Ckeditor assets for precompilation
   mattr_accessor :assets
   @@assets = nil
 
+  # Remove digest from ckeditor asset files while running assets:precompile task?
+  mattr_accessor :run_on_precompile
+  @@run_on_precompile = true
+
   # Turn on/off filename parameterize
   mattr_accessor :parameterize_filenames
   @@parameterize_filenames = true
@@ -72,10 +78,22 @@ module Ckeditor
   @@assets_languages = nil
   @@assets_plugins = nil
 
+  # CKEditor CDN
+  mattr_accessor :cdn_url
+  @@cdn_url = nil
+
+  # Url to ckeditor config, used when CDN enabled
+  mattr_accessor :js_config_url
+  @@js_config_url = '/assets/ckeditor/config.js'
+
   # Model classes
   @@picture_model = nil
   @@attachment_file_model = nil
 
+  # Configurable parent controller
+  mattr_accessor :parent_controller
+  @@parent_controller = 'ApplicationController'
+
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #
@@ -93,9 +111,25 @@ module Ckeditor
     @root_path ||= Pathname.new(File.dirname(File.expand_path('../', __FILE__)))
   end
 
+  def self.base_path
+    @base_path ||= (asset_path || File.join([Rails.application.config.assets.prefix, '/ckeditor/']))
+  end
+
   # All css and js files from ckeditor folder
   def self.assets
-    @@assets ||= Utils.select_assets("ckeditor", "vendor/assets/javascripts") + ["ckeditor/init.js", 'ckcontent.css']
+    @@assets ||= if Ckeditor.cdn_enabled?
+      ["ckeditor/config.js"]
+    else
+      Utils.select_assets("ckeditor", "vendor/assets/javascripts") << "ckeditor/init.js"
+    end
+  end
+
+  def self.run_on_precompile?
+    @@run_on_precompile
+  end
+
+  def self.cdn_enabled?
+    !@@cdn_url.nil?
   end
 
   def self.picture_model(&block)
@@ -201,4 +235,4 @@ require 'ckeditor/version'
 
 if Object.const_defined?("RailsAdmin")
   require "ckeditor/rails_admin/field"
-end
+end

data/lib/ckeditor/asset_response.rb

@@ -0,0 +1,59 @@
+module Ckeditor
+  class AssetResponse
+    attr_reader :asset, :params
+
+    def initialize(asset, request)
+      @asset = asset
+      @request = request
+      @params = request.params
+
+      @asset.data = Ckeditor::Http.normalize_param(file, @request)
+    end
+
+    def json?
+      params[:responseType] == 'json'
+    end
+
+    def ckeditor?
+      !params[:CKEditor].blank?
+    end
+
+    def file
+      !(ckeditor? || json?) ? params[:qqfile] : params[:upload]
+    end
+
+    def success(relative_url_root = nil)
+      if json?
+        {
+          json: { "uploaded" => 1, "fileName" => asset.filename, "url" => asset.url }.to_json
+        }
+      elsif ckeditor?
+        {
+          text: %Q"<script type='text/javascript'>
+            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
+          </script>"
+        }
+      else
+        {
+          json: asset.to_json(only: [:id, :type])
+        }
+      end
+    end
+
+    def errors
+      if json?
+        {
+          json: { "uploaded" => 0, "error" => { "message" => "Upload failed"} }.to_json
+        }
+      elsif ckeditor?
+        {
+          text: %Q"<script type='text/javascript'>
+            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{Ckeditor::Utils.escape_single_quotes(asset.errors.full_messages.first)}');
+          </script>"
+        }
+      else
+        {nothing: true, format: :json}
+      end
+    end
+  end
+end