ckeditor 4.0.7 → 4.0.8

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

@@ -4,7 +4,7 @@
           polymorphic_path(asset, :format => :json),
           :remote => true,
           :method => :delete, 
-          :confirm => t('ckeditor.confirm_delete'),
+          :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
 	
 	<div class="fileupload-file gal-inner-holder">

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

@@ -5,7 +5,7 @@
           "/ckeditor/${controller}/${id}.json", 
           :remote => true,
           :method => :delete, 
-          :confirm => t('ckeditor.confirm_delete'),
+          :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
 	
 	<div class="fileupload-file gal-inner-holder">

data/config/locales/cs.ckeditor.yml

@@ -6,3 +6,4 @@ cs:
       cancel: "Zrušit"
       upload: "Nahrát"
       delete: "Smazat"
+      next: "Next"

data/config/locales/de.ckeditor.yml

@@ -6,3 +6,4 @@ de:
       cancel: "Abbrechen"
       upload: "Hochladen"
       delete: "Löschen"
+      next: "Next"

data/config/locales/el-GR.cdkeditor.yml

@@ -5,4 +5,5 @@
     buttons:
       cancel: "Ακύρωση"
       upload: "Μεταφόρτωση"
-      delete: "Διαγραφή"
+      delete: "Διαγραφή"
+      next: "Next"

data/config/locales/en.ckeditor.yml

@@ -6,3 +6,4 @@ en:
       cancel: "Cancel"
       upload: "Upload"
       delete: "Delete"
+      next: "Next"

data/config/locales/es.ckeditor.yml

@@ -6,3 +6,4 @@ es:
       cancel: "Cancelar"
       upload: "Subir"
       delete: "Borrar"
+      next: "Next"

data/config/locales/fr.ckeditor.yml

@@ -6,3 +6,4 @@ fr:
       cancel: "Annuler"
       upload: "Ajouter"
       delete: "Supprimer"
+      next: "Next"

data/config/locales/hu.ckeditor.yml

@@ -6,3 +6,4 @@ hu:
       cancel: "Mégsem"
       upload: "Feltöltés"
       delete: "Törlés"
+      next: "Next"

data/config/locales/it.ckeditor.yml

@@ -6,3 +6,4 @@ it:
       cancel: "Annulla"
       upload: "Carica"
       delete: "Elimina"
+      next: "Next"

data/config/locales/nl.ckeditor.yml

@@ -5,4 +5,5 @@ nl:
     buttons:
       cancel: "Cancel"
       upload: "Upload"
-      delete: "Delete"
+      delete: "Delete"
+      next: "Next"

data/config/locales/pl.ckeditor.yml

@@ -6,3 +6,4 @@ pl:
       cancel: "Anuluj"
       upload: "Wyślij"
       delete: "Skasuj"
+      next: "Next"

data/config/locales/pt-BR.ckeditor.yml

@@ -5,4 +5,5 @@
     buttons:
       cancel: "Cancelar"
       upload: "Enviar"
-      delete: "Apagar"
+      delete: "Apagar"
+      next: "Next"

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

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

data/config/locales/ru.ckeditor.yml

@@ -6,3 +6,4 @@ ru:
       cancel: "Отмена"
       upload: "Загрузить"
       delete: "Удалить"
+      next: "Показать еще"

data/config/locales/sv-SE.ckeditor.yml

@@ -6,3 +6,4 @@
       cancel: "Avbryt"
       upload: "Ladda upp"
       delete: "Ta bort"
+      next: "Next"

data/config/locales/uk.ckeditor.yml

@@ -6,3 +6,4 @@ uk:
       cancel: "Відміна"
       upload: "Завантажити"
       delete: "Видалити"
+      next: "Показати більше"

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

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

data/lib/ckeditor.rb

@@ -5,6 +5,7 @@ module Ckeditor
   autoload :Utils, 'ckeditor/utils'
   autoload :Http, 'ckeditor/http'
   autoload :TextArea, 'ckeditor/text_area'
+  autoload :Paginatable, 'ckeditor/paginatable'
   
   module Helpers
     autoload :ViewHelper, 'ckeditor/helpers/view_helper'
@@ -56,6 +57,16 @@ module Ckeditor
   mattr_accessor :parameterize_filenames
   @@parameterize_filenames = true
 
+  # Paginate assets
+  mattr_accessor :default_per_page
+  @@default_per_page = 24
+
+  # Asset restrictions
+  mattr_accessor :assets_languages
+  mattr_accessor :assets_plugins
+  @@assets_languages = nil
+  @@assets_plugins = nil
+
   # Model classes
   @@picture_model = nil
   @@attachment_file_model = nil

data/lib/ckeditor/helpers/controllers.rb

@@ -14,7 +14,7 @@ module Ckeditor
         end
         
         def ckeditor_before_create_asset(asset)
-          asset.assetable = ckeditor_current_user  if respond_to?(:current_user)
+          asset.assetable = ckeditor_current_user if ckeditor_current_user
           return true
         end
         

data/lib/ckeditor/paginatable.rb

@@ -0,0 +1,56 @@
+module Ckeditor
+  # Simple paginate relation
+  class Paginatable
+    attr_reader :limit_value, :offset_value
+
+    def initialize(scope, options = {})
+      @scope = scope
+      @limit_value = (options[:limit] || Ckeditor.default_per_page).to_i
+    end
+
+    def page(num = 1)
+      @offset_value = limit_value * ([num.to_i, 1].max - 1)
+      self
+    end
+
+    def scoped
+      @scope.limit(limit_value).offset(offset_value)
+    end
+
+    # Next page number in the collection
+    def next_page
+      current_page + 1 unless last_page?
+    end
+
+    # Previous page number in the collection
+    def prev_page
+      current_page - 1 unless first_page?
+    end
+
+    # First page of the collection?
+    def first_page?
+      current_page == 1
+    end
+
+    # Last page of the collection?
+    def last_page?
+      current_page >= total_pages
+    end
+
+    # Total number of pages
+    def total_pages
+      (total_count.to_f / limit_value).ceil
+    end
+
+    # total item numbers of scope
+    def total_count
+      @total_count ||= @scope.count
+    end
+
+    # Current page number
+    def current_page
+      offset = (offset_value < 0 ? 0 : offset_value)
+      (offset / limit_value) + 1
+    end
+  end
+end

data/lib/ckeditor/utils.rb

@@ -4,13 +4,8 @@ require 'active_support/json/encoding'
 module Ckeditor
   module Utils
     class JavascriptCode < String
-      def to_json(options = nil)
-        self
-      end
-      
-      def as_json(options = nil)
-        ActiveSupport::JSON::Variable.new(to_s).freeze
-      end
+      def as_json(options = nil) self end #:nodoc:
+      def encode_json(encoder) self end #:nodoc:
     end
 
     class << self
@@ -55,32 +50,60 @@ module Ckeditor
             options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
             options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
-        
+
         js_options = ActiveSupport::JSON.encode(options)
-        
+
         "(function() { new qq.FileUploaderInput(#{js_options}); }).call(this);".html_safe
       end
-      
+
       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")
-	      
+
 	      unless File.exists?(File.join(source, image))
 	        image = "unknown.gif"
 	      end
-	      
+
 	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
       end
 
       def select_assets(path, relative_path)
-        folder = File.join(relative_path, path, '**')
-        relative_folder = Ckeditor.root_path.join(relative_path)
-      
-        Dir[Ckeditor.root_path.join(folder, '*.{js,css,png,gif,jpg}')].inject([]) do |list, file|
-          list << Pathname.new(file).relative_path_from(relative_folder).to_s
-          list
+        relative_folder = Ckeditor.root_path.join relative_path
+        folder = relative_folder.join path
+        extensions = '*.{js,css,png,gif,jpg}'
+
+        # Files at root
+        files = Dir[folder.join(extensions)]
+
+        # Plugins
+        if Ckeditor.assets_plugins.nil?
+          files += Dir[folder.join('plugins', '**', extensions)]
+        else
+          Ckeditor.assets_plugins.each do |plugin|
+            files += Dir[folder.join('plugins', plugin, '**', extensions)]
+          end
+        end
+
+        # Other folders
+        Dir[folder.join('*/')].each do |subfolder|
+          path = Pathname.new(subfolder)
+          unless path.basename.to_s == 'plugins'
+            files += Dir[path.join('**', extensions)]
+          end
         end
+
+        paths = files.map { |file| Pathname.new(file) }
+
+        # Filter languages
+        if Ckeditor.assets_languages.present?
+          paths.select! do |path|
+            path.dirname.basename.to_s != 'lang' ||
+            Ckeditor.assets_languages.include?(path.basename.to_s.split('.')[0])
+          end
+        end
+
+        paths.map { |path| path.relative_path_from(relative_folder).to_s }
       end
     end
   end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.0.7".freeze
-    EDITOR = "4.3".freeze
+    GEM = "4.0.8".freeze
+    EDITOR = "4.3.1".freeze
   end
 end

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

@@ -20,4 +20,7 @@ Ckeditor.setup do |config|
   # Asset model classes
   # config.picture_model { Ckeditor::Picture }
   # config.attachment_file_model { Ckeditor::AttachmentFile }
+
+  # Paginate assets
+  # config.default_per_page = 24
 end

data/vendor/assets/javascripts/ckeditor/CHANGES.md

@@ -1,6 +1,42 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.3.1
+
+**Important Notes:**
+
+* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
+* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
+
+Fixed Issues:
+
+* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
+* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
+* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
+* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
+* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
+* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
+* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
+* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
+* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
+* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
+* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
+* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
+* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
+* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
+* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
+* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
+* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
+* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
+* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
+* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
+* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
+* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
+* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
+* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
+* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
+* [#11200](http://dev.ckeditor.com/ticket/11200):  Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
+
 ## CKEditor 4.3
 
 New Features: