ckeditor 3.7.1 → 3.7.2

data/README.rdoc

@@ -68,6 +68,10 @@ Mount engine in your routes (config/routes.rb):
 
   mount Ckeditor::Engine => "/ckeditor"
 
+Procompile ckeditor js and css files (config/environments/production.rb):
+
+  config.assets.precompile += Ckeditor.assets
+
 Include ckeditor javascripts rails 3.2:
 
   //= require ckeditor/init
@@ -88,18 +92,16 @@ Form helpers:
   cktext_area_tag("content", "Ckeditor", :input_html => {:cols => 10, :rows => 20}, :toolbar => 'Easy')
   
 * input_html - Options for text_area tag, others for ckeditor javascript configuration.
-* language - appends automatically, by default is I18n.locale
+* language - appends automatically, by default it's I18n.locale
 * available ckeditor options - http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
 
-For configure ckeditor default options check:
+In order to configure the ckeditor default options, create files:
 
-  public/javascripts/ckeditor/config.js
-  
-This stylesheet use editor for displaying edit area:
+  app/assets/javascripts/ckeditor/config.js
 
-  public/javascripts/ckeditor/contents.css
-
-FormBuilder helper for more usefully:
+  app/assets/javascripts/ckeditor/contents.css
+  
+Here's a FormBuilder helper example:
 
   <%= form_for @page do |form| -%>
     ...
@@ -112,7 +114,7 @@ FormBuilder helper for more usefully:
 
 === AJAX
 
-Jquery sample:
+jQuery sample:
 
   <script type='text/javascript' charset='UTF-8'>
     $(document).ready(function(){  
@@ -146,7 +148,7 @@ For example, you need split assets collection for each user.
       end
   end
   
-If your wont filter only pictures or attachment_files - redefine methods "ckeditor_pictures_scope" or "ckeditor_attachment_files_scope" respectively.
+If you want to filter only pictures or attachment_files - redefine methods "ckeditor_pictures_scope" or "ckeditor_attachment_files_scope" respectively.
 By default, both these methods call "ckeditor_filebrowser_scope" method:
 
   class ApplicationController < ActionController::Base

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

@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+jQuery.noConflict();
+
+CKEDITOR.editorConfig = function( config )
+{
+  // Define changes to default configuration here. For example:
+  // config.language = 'fr';
+  // config.uiColor = '#AADC6E';
+  
+  /* Filebrowser routes */
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of a script that handles file uploads in the Flash dialog.
+  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+  
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
+  config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+  config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+
+  // The location of a script that handles file uploads in the Image dialog.
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+  
+  // The location of a script that handles file uploads.
+  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+  
+  // Rails CSRF token
+  config.filebrowserParams = function(){
+    var csrf_token = jQuery('meta[name=csrf-token]').attr('content'),
+        csrf_param = jQuery('meta[name=csrf-param]').attr('content'),
+        params = new Object();
+    
+    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 (jQuery.inArray(dialogName, ['link', 'image', 'attachment', 'flash']) > -1) {
+      content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload'));
+      upload = (content == null ? null : content.get('upload'));
+      
+      if (upload && upload.filebrowser['params'] == null) {
+        upload.filebrowser['params'] = config.filebrowserParams();
+        upload.action = config.addQueryString(upload.action, upload.filebrowser['params']);
+      }
+    }
+  });
+  
+  /* Extra plugins */
+  // works only with en, ru, uk locales
+  config.extraPlugins = "embed,attachment";
+  
+  /* Toolbars */
+  config.toolbar = 'Easy';
+  
+  config.toolbar_Easy =
+    [
+        ['Source','-','Preview'],
+        ['Cut','Copy','Paste','PasteText','PasteFromWord',],
+        ['Undo','Redo','-','SelectAll','RemoveFormat'],
+        ['Styles','Format'], ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
+        ['Bold','Italic','Underline','Strike'], ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+        ['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash', 'Embed'],
+        ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak']
+    ];
+};

data/config/locales/it.ckeditor.yml

@@ -0,0 +1,8 @@
+it:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    confirm_delete: "Cancellare il file?"
+    buttons:
+      cancel: "Annulla"
+      upload: "Carica"
+      delete: "Elimina"

data/config/locales/nl.ckeditor.yml

@@ -0,0 +1,8 @@
+nl:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    confirm_delete: "Delete file?"
+    buttons:
+      cancel: "Cancel"
+      upload: "Upload"
+      delete: "Delete"

data/lib/ckeditor/helpers/view_helper.rb

@@ -4,7 +4,7 @@ module Ckeditor
       extend ActiveSupport::Concern
       
       def cktext_area_tag(name, content = nil, options = {})
-        element_id = sanitize_to_id(name)
+        element_id = sanitize_to_id(options[:id] || name)
         options = { :language => I18n.locale.to_s }.merge(options)
         input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
         js_content_for_section = options.delete(:js_content_for)

data/lib/ckeditor/utils.rb

@@ -19,6 +19,8 @@ module Ckeditor
       end
       
       def parameterize_filename(filename)
+        return filename unless Ckeditor.parameterize_filenames
+
         extension = File.extname(filename)
         basename = filename.gsub(/#{extension}$/, "")
         
@@ -31,7 +33,7 @@ module Ckeditor
         js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
         js << "CKEDITOR.replace('#{dom_id}', #{js_options});"
 
-        "$(document).ready(function(){ #{js.join} });".html_safe
+        "window.onload = function(){ #{js.join} };".html_safe
       end
       
       def js_fileuploader(uploader_type, options = {})
@@ -51,13 +53,13 @@ module Ckeditor
         
         js_options = ActiveSupport::JSON.encode(options)
         
-        "$(document).ready(function(){ new qq.FileUploaderInput(#{js_options}); });".html_safe
+        "window.onload = function(){ new qq.FileUploaderInput(#{js_options}); };".html_safe
       end
       
       def filethumb(filename)
         extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
 	      image = "#{extname}.gif"
-	      source = Ckeditor.root_path.join("vendor/assets/javascripts/ckeditor/filebrowser/images/thumbs")
+	      source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
 	      
 	      unless File.exists?(File.join(source, image))
 	        image = "unknown.gif"
@@ -65,6 +67,16 @@ module Ckeditor
 	      
 	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
       end
+
+      def select_assets(path, relative_path)
+        folder = File.join(path, '**')
+        relative_folder = Ckeditor.root_path.join(relative_path)
+      
+        Dir[Ckeditor.root_path.join(folder, '*.{js,css}')].inject([]) do |list, file|
+          list << Pathname.new(file).relative_path_from(relative_folder).to_s
+          list
+        end
+      end
     end
   end
 end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "3.7.1".freeze
-    EDITOR = "3.6.3".freeze
+    GEM = "3.7.2".freeze
+    EDITOR = "3.6.4".freeze
   end
 end

data/lib/ckeditor.rb

@@ -41,6 +41,10 @@ module Ckeditor
   # Ckeditor assets for precompilation
   mattr_accessor :assets
   @@assets = nil
+
+  # Turn on/off filename parameterize
+  mattr_accessor :parameterize_filenames
+  @@parameterize_filenames = true
   
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
@@ -54,13 +58,8 @@ module Ckeditor
   
   def self.assets
     @@assets ||= begin
-      Dir[root_path.join('vendor/assets/javascripts/ckeditor/**', '*.{js,css}')].inject([]) do |list, path|
-        unless path.include?("/ckeditor/filebrowser/")
-          list << Pathname.new(path).relative_path_from(root_path.join('vendor/assets/javascripts'))
-        end
-        
-        list
-      end
+      Utils.select_assets("vendor/assets/javascripts/ckeditor", "vendor/assets/javascripts") +
+      Utils.select_assets("app/assets/javascripts/ckeditor/plugins", "app/assets/javascripts")
     end
   end
   

data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/attachment_file.rb

@@ -1,7 +1,7 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
-	
-	def url_thumb
-	  @url_thumb ||= Ckeditor::Utils.filethumb(filename)
-	end
+
+  def url_thumb
+    @url_thumb ||= Ckeditor::Utils.filethumb(filename)
+  end
 end

data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/picture.rb

@@ -1,7 +1,7 @@
 class Ckeditor::Picture < Ckeditor::Asset
   mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
-	
-	def url_content
-	  url(:content)
-	end
+
+  def url_content
+    url(:content)
+  end
 end

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

@@ -6,18 +6,18 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.integer :data_file_size
       
       t.integer :assetable_id
-		  t.string  :assetable_type, :limit => 30
+      t.string  :assetable_type, :limit => 30
       t.string  :type, :limit => 30
-		  
+      
       # Uncomment	it to save images dimensions, if your need it
-		  t.integer :width
-		  t.integer :height
-		  
+      t.integer :width
+      t.integer :height
+      
       t.timestamps
     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", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
   end
 
   def self.down

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

@@ -6,18 +6,18 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.integer :data_file_size
       
       t.integer :assetable_id
-		  t.string  :assetable_type, :limit => 30
+      t.string  :assetable_type, :limit => 30
       t.string  :type, :limit => 30
-		  
+
       # Uncomment	it to save images dimensions, if your need it
-		  t.integer :width
-		  t.integer :height
-		  
+      t.integer :width
+      t.integer :height
+
       t.timestamps
     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", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
   end
 
   def self.down

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb

@@ -13,7 +13,7 @@ class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "system/ckeditor_assets/attachments/#{model.id}"
+    "/uploads/ckeditor/attachments/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_picture_uploader.rb

@@ -13,7 +13,7 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "system/ckeditor_assets/pictures/#{model.id}"
+    "/uploads/ckeditor/pictures/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

data/lib/generators/ckeditor/templates/base/dragonfly/initializer.rb

@@ -11,15 +11,15 @@ app.define_macro(ActiveRecord::Base, :ckeditor_file_accessor) if defined?(Active
 app.define_macro_on_include(Mongoid::Document, :ckeditor_file_accessor) if defined?(Mongoid::Document)
 
 app.configure do |c|
-  # Store files in public/system/ckeditor_assets. This is not
+  # Store files in public/uploads/ckeditor. This is not
   # mandatory and the files don't even have to be stored under
   # public. If not storing under public then set server_root to nil.
-  c.datastore.root_path = Rails.root.join("public", "system", "ckeditor_assets", Rails.env).to_s
+  c.datastore.root_path = Rails.root.join("public", "uploads", "ckeditor", Rails.env).to_s
   c.datastore.server_root = Rails.root.join("public").to_s
 
   # Accept asset requests on /ckeditor_assets. Again, this is not
   # mandatory. Just be sure to include :job somewhere.
-  c.url_format = "/ckeditor_assets/:job/:basename.:format"
+  c.url_format = "/uploads/ckeditor/:job/:basename.:format"
 end
 
 # Insert our Dragonfly "app" into the stack.

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/attachment_file.rb

@@ -1,7 +1,7 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
-	
-	def url_thumb
-	  @url_thumb ||= Ckeditor::Utils.filethumb(filename)
-	end
+
+  def url_thumb
+    @url_thumb ||= Ckeditor::Utils.filethumb(filename)
+  end
 end

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/picture.rb

@@ -1,7 +1,7 @@
 class Ckeditor::Picture < Ckeditor::Asset
   mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
-	
-	def url_content
-	  url(:content)
-	end
+
+  def url_content
+    url(:content)
+  end
 end