ckeditor 3.5.1 → 3.5.2

data/README.rdoc

@@ -24,7 +24,7 @@ http://github.com/galetahub/ckeditor-demo-app
 
 In your appication "Gemfile":
 
-  gem 'ckeditor', '3.5.1'
+  gem 'ckeditor'
   
 or
   gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
@@ -49,7 +49,7 @@ For attachment_fu:
 
 Don't forget about migration:
 
-  rake db:migarte
+  rake db:migrate
 
 == Usage
 
@@ -151,6 +151,7 @@ support swf upload with AuthenticityToken.
       page_title: "CKEditor Files Manager"
       upload_files: "Upload New Files"
       buttons:
+        cancel: "Cancel"
         refresh:
           title: "Refresh"
           hint: "Refresh page"

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

@@ -32,7 +32,7 @@
 						  <tbody><tr>
 							  <td width="100%"></td>
 							  <td nowrap="nowrap">
-								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn">Cancel</span></button>
+								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn"><%= I18n.t('cancel', :scope => [:ckeditor, :buttons]) %></span></button>
 							  </td>
 						  </tr>
 					  </tbody></table>

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

@@ -32,7 +32,7 @@
 						  <tbody><tr>
 							  <td width="100%"></td>
 							  <td nowrap="nowrap">
-								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn">Cancel</span></button>
+								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn"><%= I18n.t('cancel', :scope => [:ckeditor, :buttons]) %></span></button>
 							  </td>
 						  </tr>
 					  </tbody></table>

data/config/locales/en.ckeditor.yml

@@ -3,6 +3,7 @@ en:
     page_title: "CKEditor Files Manager"
     upload_files: "Upload New Files"
     buttons:
+      cancel: "Cancel"
       refresh:
         title: "Refresh"
         hint: "Refresh page"

data/config/locales/ru.ckeditor.yml

@@ -3,6 +3,7 @@ ru:
     page_title: "CKEditor Files Manager"
     upload_files: "Загрузка новых файлов"
     buttons:
+      cancel: "Отмена"
       refresh:
         title: "Обновить"
         hint: "Обновить страницу"

data/config/locales/uk.ckeditor.yml

@@ -3,6 +3,7 @@ uk:
     page_title: "CKEditor Files Manager"
     upload_files: "Завантаження нових файлів"
     buttons:
+      cancel: "Відміна"
       refresh:
         title: "Оновити"
         hint: "Оновити сторінку"

data/lib/ckeditor/utils.rb

@@ -1,9 +1,61 @@
+# encoding: utf-8
 require 'fileutils'
-require 'net/http'
-require 'uri'
+require 'open-uri'
+require 'digest/sha1'
+require 'mime/types'
 
 module Ckeditor
   module Utils
+    # RemoteFile
+    # 
+    # remote_file = RemoteFile.new("http://www.google.com/intl/en_ALL/images/logo.gif")
+    # remote_file.original_filename #=> logo.gif
+    # remote_file.content_type #= image/gif
+    #
+    class RemoteFile < ::Tempfile
+
+      def initialize(path, tmpdir = Dir::tmpdir)
+        @original_filename  = File.basename(path)
+        @remote_path        = path
+     
+        super Digest::SHA1.hexdigest(path), tmpdir
+        fetch
+      end
+     
+      def fetch
+        string_io = OpenURI.send(:open, @remote_path)
+        body = string_io.read
+        
+        # Fix for ruby 1.9.2 (ASCII-8BIT and UTF-8 in hell issue)
+        if body && body.respond_to?(:encoding) && body.encoding.name == 'ASCII-8BIT'
+          body.force_encoding('UTF-8')
+        end
+        
+        self.write body
+        self.rewind
+        self
+      end
+     
+      def original_filename
+        @original_filename
+      end
+     
+      def content_type
+        types = MIME::Types.type_for(self.path)
+    	  types.empty? ? extract_content_type : types.first.to_s
+      end
+      
+      protected
+        
+        def extract_content_type
+          mime = `file --mime -br #{self.path}`.strip
+          mime = mime.gsub(/^.*: */,"")
+          mime = mime.gsub(/;.*$/,"")
+          mime = mime.gsub(/,.*$/,"")
+          mime
+        end
+    end
+  
     class << self
       # remove the existing install (if any)
       def destroy
@@ -24,19 +76,8 @@ module Ckeditor
         [basename.parameterize('_'), extension].join.downcase
       end
       
-      def download(url, output)
-        uri = URI.parse(url)
-        file = File.open(output, 'w')
-        
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          begin
-            http.request_get(uri.path) do |resp|
-              resp.read_body { |segment| file.write(segment) }
-            end
-          ensure
-            file.close
-          end
-        end
+      def download(url)
+        RemoteFile.new(url)
       end
       
       def extract(filepath, output)
@@ -50,6 +91,5 @@ module Ckeditor
       end
       
     end
-    
   end
 end

data/lib/ckeditor/version.rb

@@ -2,7 +2,7 @@ module Ckeditor
   module Version
     MAJOR = 3
     MINOR = 5
-    RELEASE = 1
+    RELEASE = 2
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

data/lib/generators/ckeditor/base/base_generator.rb

@@ -17,14 +17,12 @@ module Ckeditor
     # copy ckeditor files
     def install_ckeditor
       puts "Start download #{filename}"
-      Ckeditor::Utils.download(download_url, filepath)
-      
-      if File.exist?(filepath)
-        puts "Extract #{filepath}"
-        Ckeditor::Utils.extract(filepath, Rails.root.join('public', 'javascripts'))
+      file = Ckeditor::Utils.download(download_url)
       
+      if File.exist?(file.path)
+        Ckeditor::Utils.extract(file.path, Rails.root.join('public', 'javascripts'))
         directory "ckeditor", "public/javascripts/ckeditor"
-        File.delete(filepath)
+        file.unlink
       else
         raise Rails::Generators::Error.new("Cannot download file #{download_url}")
       end
@@ -39,9 +37,5 @@ module Ckeditor
       def filename
         "ckeditor_#{options[:version]}.tar.gz"
       end
-      
-      def filepath
-        Rails.root.join('tmp', filename)
-      end
   end
 end

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/dialogs/attachment.js

@@ -0,0 +1,384 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	CKEDITOR.dialog.add( 'attachment', function( editor )
+	  {
+	    var selectableTargets = /^(_(?:self|top|parent|blank))$/;
+	     
+	    var parseLink = function( editor, element )
+      {
+	      var href = element ? ( element.getAttribute( '_cke_saved_href' ) || element.getAttribute( 'href' ) ) : '',
+		      emailMatch,
+		      anchorMatch,
+		      urlMatch,
+		      retval = {};
+
+	      retval.type = 'url';
+		    retval.url = href;
+
+	      // Load target and popup settings.
+	      if ( element )
+	      {
+		      var target = element.getAttribute( 'target' );
+		      retval.target = {};
+
+		      // IE BUG: target attribute is an empty string instead of null in IE if it's not set.
+		      if ( target )
+		      {
+			      var targetMatch = target.match( selectableTargets );
+			      if ( targetMatch )
+				      retval.target.type = retval.target.name = target;
+			      else
+			      {
+				      retval.target.type = 'frame';
+				      retval.target.name = target;
+			      }
+		      }
+
+		      var me = this;
+		      
+		      retval.title = element.getAttribute('title');
+	      }
+
+	      // Find out whether we have any anchors in the editor.
+	      // Get all IMG elements in CK document.
+	      var elements = editor.document.getElementsByTag( 'img' ),
+		      realAnchors = new CKEDITOR.dom.nodeList( editor.document.$.anchors ),
+		      anchors = retval.anchors = [];
+
+	      for( var i = 0; i < elements.count() ; i++ )
+	      {
+		      var item = elements.getItem( i );
+		      if ( item.getAttribute( '_cke_realelement' ) && item.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+		      {
+			      anchors.push( editor.restoreRealElement( item ) );
+		      }
+	      }
+
+	      for ( i = 0 ; i < realAnchors.count() ; i++ )
+		      anchors.push( realAnchors.getItem( i ) );
+
+	      for ( i = 0 ; i < anchors.length ; i++ )
+	      {
+		      item = anchors[ i ];
+		      anchors[ i ] = { name : item.getAttribute( 'name' ), id : item.getAttribute( 'id' ) };
+	      }
+
+	      // Record down the selected element in the dialog.
+	      this._.selectedElement = element;
+
+	      return retval;
+      };
+	    // Handles the event when the "Target" selection box is changed.
+	    var targetChanged = function()
+	    {
+		    var dialog = this.getDialog(),
+			    targetName = dialog.getContentElement( 'general', 'linkTargetName' ),
+			    value = this.getValue();
+
+		    if ( !targetName )
+			    return;
+
+		    targetName.setLabel( editor.lang.link.targetFrameName );
+			  this.getDialog().setValueOf( 'general', 'linkTargetName', value.charAt( 0 ) == '_' ? value : '' );
+	    };
+	    
+	    function parseUrl(url)
+	    {
+	      var filename = url.split('/').pop();
+	      var extname = filename.split('.').pop();
+	      
+	      return { filename : filename, className : "attach_" + extname };
+	    }
+	
+			return {
+				title : editor.lang.attachment.title,
+			  minWidth : 420,
+  			minHeight : 200,
+
+				onShow : function()
+				{
+					this.fakeObj = false;
+
+			    var editor = this.getParentEditor(),
+				    selection = editor.getSelection(),
+				    ranges = selection.getRanges(),
+				    element = null,
+				    me = this;
+			    // Fill in all the relevant fields if there's already one link selected.
+			    if ( ranges.length == 1 )
+			    {
+
+				    var rangeRoot = ranges[0].getCommonAncestor( true );
+				    element = rangeRoot.getAscendant( 'a', true );
+				    if ( element && element.getAttribute( 'href' ) )
+				    {
+					    selection.selectElement( element );
+				    }
+				    else if ( ( element = rangeRoot.getAscendant( 'img', true ) ) &&
+						     element.getAttribute( '_cke_real_element_type' ) &&
+						     element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+				    {
+					    this.fakeObj = element;
+					    element = editor.restoreRealElement( this.fakeObj );
+					    selection.selectElement( this.fakeObj );
+				    }
+				    else
+					    element = null;
+			    }
+
+			    this.setupContent( parseLink.apply( this, [ editor, element ] ) );
+				},
+
+				onOk : function()
+				{
+				  var attributes = { href : 'javascript:void(0)/*' + CKEDITOR.tools.getNextNumber() + '*/' },
+				  removeAttributes = [],
+				  data = { href : attributes.href },
+				  me = this,
+				  editor = this.getParentEditor();
+
+			    this.commitContent( data );
+			    
+			    
+					var url = data.url || '';
+					attributes._cke_saved_href = ( url.indexOf( '/' ) === 0 ) ? url : "http://" + url;
+					
+			    var file = parseUrl(url);
+			    
+					var title = data.title || '';
+					attributes.title = (data.title.length == 0) ? file.filename : data.title;
+					attributes.class = file.className;
+					
+					// Popups and target.
+			    if ( data.target )
+			    {
+			      if ( data.target.type != 'notSet' && data.target.name )
+						  attributes.target = data.target.name;
+					  else
+						  removeAttributes.push( 'target' );
+
+					  removeAttributes.push( '_cke_pa_onclick', 'onclick' );
+			    }
+			    
+			    // Insert Link
+			    if ( !this._.selectedElement )
+			    {
+				    // Create element if current selection is collapsed.
+				    var selection = editor.getSelection(),
+					    ranges = selection.getRanges();
+				    if ( ranges.length == 1 && ranges[0].collapsed )
+				    {
+					    var text = new CKEDITOR.dom.text( attributes.title, editor.document );
+					    ranges[0].insertNode( text );
+					    ranges[0].selectNodeContents( text );
+					    selection.selectRanges( ranges );
+				    }
+
+				    // Apply style.
+				    var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
+				    style.type = CKEDITOR.STYLE_INLINE;		// need to override... dunno why.
+				    style.apply( editor.document );
+			    }
+			    else
+			    {
+				    // We're only editing an existing link, so just overwrite the attributes.
+				    var element = this._.selectedElement;
+
+				    // IE BUG: Setting the name attribute to an existing link doesn't work.
+				    // Must re-create the link from weired syntax to workaround.
+				    if ( CKEDITOR.env.ie && attributes.name != element.getAttribute( 'name' ) )
+				    {
+					    var newElement = new CKEDITOR.dom.element( '<a name="' + CKEDITOR.tools.htmlEncode( attributes.name ) + '">',
+							    editor.document );
+
+					    selection = editor.getSelection();
+
+					    element.moveChildren( newElement );
+					    element.copyAttributes( newElement, { name : 1 } );
+					    newElement.replace( element );
+					    element = newElement;
+
+					    selection.selectElement( element );
+				    }
+
+				    element.setAttributes( attributes );
+				    element.removeAttributes( removeAttributes );
+            
+            if (element.getAttribute('title') )
+              element.setHtml(element.getAttribute('title'));
+            
+				    // Make the element display as an anchor if a name has been set.
+				    if ( element.getAttribute( 'name' ) )
+					    element.addClass( 'cke_anchor' );
+				    else
+					    element.removeClass( 'cke_anchor' );
+
+				    if ( this.fakeObj )
+					    editor.createFakeElement( element, 'cke_anchor', 'anchor' ).replace( this.fakeObj );
+
+				    delete this._.selectedElement;
+			    }
+				},
+
+				contents :
+				[
+					{
+						label : editor.lang.common.generalTab,
+						id : 'general',
+						accessKey : 'I',
+						elements :
+						[
+							{
+							  type : 'vbox',
+							  padding : 0,
+							  children :
+							  [
+								  {
+									  type : 'html',
+									  html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.attachment.url ) + '</span>'
+								  },
+								  {
+									  type : 'hbox',
+									  widths : [ '280px', '110px' ],
+									  align : 'right',
+									  children :
+									  [
+										  {
+											  id : 'src',
+											  type : 'text',
+											  label : '',
+											  validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.flash.validateSrc ),
+											  setup : function( data )
+										    {
+											    if ( data.url )
+												    this.setValue( data.url );
+											    
+											    this.select();
+										    },
+										    commit : function( data )
+										    {
+											    data.url = this.getValue();
+										    }
+										  },
+										  {
+											  type : 'button',
+											  id : 'browse',
+											  filebrowser : 'general:src',
+											  hidden : true,
+											  align : 'center',
+											  label : editor.lang.common.browseServer
+										  }
+									  ]
+								  }
+							  ]
+						  },
+						  
+						  {
+						    type : 'vbox',
+							  padding : 0,
+							  children :
+							  [
+								  {
+								    id : 'name',
+								    type : 'text',
+								    label : editor.lang.attachment.name,
+  									setup : function( data )
+										{
+										  if ( data.title )
+										    this.setValue( data.title );
+										},
+	  								commit : function( data )
+								    {
+									    data.title = this.getValue();
+								    }
+							    }
+							  ]
+						  },
+						  
+						  {
+						    type : 'hbox',
+						    widths : [ '50%', '50%' ],
+						    children :
+						    [
+							    {
+								    type : 'select',
+								    id : 'linkTargetType',
+								    label : editor.lang.link.target,
+								    'default' : 'notSet',
+								    style : 'width : 100%;',
+								    'items' :
+								    [
+									    [ editor.lang.link.targetNotSet, 'notSet' ],
+									    [ editor.lang.link.targetFrame, 'frame' ],
+									    [ editor.lang.link.targetNew, '_blank' ],
+									    [ editor.lang.link.targetTop, '_top' ],
+									    [ editor.lang.link.targetSelf, '_self' ],
+									    [ editor.lang.link.targetParent, '_parent' ]
+								    ],
+								    onChange : targetChanged,
+								    setup : function( data )
+								    {
+									    if ( data.target )
+										    this.setValue( data.target.type );
+								    },
+								    commit : function( data )
+								    {
+									    if ( !data.target )
+										    data.target = {};
+
+									    data.target.type = this.getValue();
+								    }
+							    },
+							    {
+								    type : 'text',
+								    id : 'linkTargetName',
+								    label : editor.lang.link.targetFrameName,
+								    'default' : '',
+								    setup : function( data )
+								    {
+									    if ( data.target )
+										    this.setValue( data.target.name );
+								    },
+								    commit : function( data )
+								    {
+									    if ( !data.target )
+										    data.target = {};
+
+									    data.target.name = this.getValue();
+								    }
+							    }
+						    ]
+					    }
+						]
+					},
+				  {
+					  id : 'Upload',
+					  hidden : true,
+					  filebrowser : 'uploadButton',
+					  label : editor.lang.common.upload,
+					  elements :
+					  [
+						  {
+							  type : 'file',
+							  id : 'upload',
+							  label : editor.lang.common.upload,
+							  size : 38
+						  },
+						  {
+							  type : 'fileButton',
+							  id : 'uploadButton',
+							  label : editor.lang.common.uploadSubmit,
+							  filebrowser : 'general:src',
+							  'for' : [ 'Upload', 'upload' ]
+						  }
+					  ]
+				  },
+				]
+			};
+		});
+})();

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/en.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'en',
+{
+  attachment : 
+  {
+    title : "Insert attachment",
+    url: "URL",
+    name: "Title",
+    button : "Insert attachment"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/ru.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'ru',
+{
+  attachment : 
+  {
+    title : "Включить вложения",
+    url: "URL",
+    name: "Название",
+    button : "Вставить"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/uk.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'uk',
+{
+  attachment : 
+  {
+    title : "Вставити файл",
+    url: "URL",
+    name: "Назва",
+    button : "Вставити"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/plugin.js

@@ -0,0 +1,44 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @file Paste as plain text plugin
+ */
+
+(function()
+{
+	// The pastetext command definition.
+	var attachmentCmd =
+	{
+		exec : function( editor )
+		{
+		  editor.openDialog( 'attachment' );
+		  return;
+		}
+	};
+  
+	// Register the plugin.
+	CKEDITOR.plugins.add( 'attachment',
+	{
+	  lang : [ 'en', 'ru', 'uk' ],
+	  requires : [ 'dialog' ],
+	  
+		init : function( editor )
+		{ 
+			var commandName = 'attachment';
+			editor.addCommand( commandName, attachmentCmd );
+      
+			editor.ui.addButton( 'Attachment',
+				{
+					label : editor.lang.attachment.button,
+					command : commandName,
+					icon: this.path + "images/attachment.png"
+				});
+      
+			CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/attachment.js' ) );
+		}
+	});
+	
+})();

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/dialogs/embed.js

@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	CKEDITOR.dialog.add( 'embed', function( editor )
+		{
+			return {
+				title : editor.lang.embed.title,
+        
+				minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 368 : 350,
+				minHeight : 240,
+
+				onShow : function()
+				{
+					// Reset the textarea value.
+					this.getContentElement( 'general', 'content' ).getInputElement().setValue( '' );
+				},
+
+				onOk : function()
+				{
+					// Get the textarea value.
+					var text = this.getContentElement( 'general', 'content' ).getInputElement().getValue();
+
+					// Inserts the html.
+					this.getParentEditor().insertHtml( text );
+				},
+
+				contents :
+				[
+					{
+						label : editor.lang.common.generalTab,
+						id : 'general',
+						elements :
+						[
+							{
+								type : 'html',
+								id : 'pasteMsg',
+								html : '<div style="white-space:normal;width:340px;">' + editor.lang.embed.pasteMsg + '</div>'
+							},
+							{
+								type : 'html',
+								id : 'content',
+								style : 'width:340px;height:170px',
+								html :
+									'<textarea style="' +
+										'width:346px;' +
+										'height:170px;' +
+										'resize: none;' +
+										'border:1px solid black;' +
+										'background-color:white">' +
+									'</textarea>',
+								focus : function()
+								{
+									this.getElement().focus();
+								}
+							}
+						]
+					}
+				]
+			};
+		});
+})();

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/en.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'en',
+{
+  embed : 
+  {
+    title : "Paste embed",
+    button : "Paste embed",
+    pasteMsg : "Please, paste embed-code from Youtube, Myspace, Flickr and others sources into rectangle, using the keyboard (Ctrl + V), and click OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/ru.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'ru',
+{
+  embed : 
+  {
+    title : "Вставить embed",
+    button : "Вставить embed",
+    pasteMsg : "Пожалуйста, вставьте embed-код с Youtube, Myspace, Flickr и других ресурсов в прямоугольник, используя сочетание клавиш (Ctrl+V), и нажмите OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/uk.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'uk',
+{
+  embed : 
+  {
+    title : "Вставити embed",
+    button : "Вставити embed",
+    pasteMsg : "Будь ласка, вставте embed-код з Youtube, Myspace, Flickr та інших ресурсів в прямокутник, використовуючи (Ctrl+V), та нажміть OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/plugin.js

@@ -0,0 +1,43 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @file Paste as plain text plugin
+ */
+
+(function()
+{
+	// The pastetext command definition.
+	var embedCmd =
+	{
+		exec : function( editor )
+		{
+		  editor.openDialog( 'embed' );
+		  return;
+		}
+	};
+  
+	// Register the plugin.
+	CKEDITOR.plugins.add( 'embed',
+	{
+	  lang : [ 'en', 'ru', 'uk' ],
+	  requires : [ 'dialog' ],
+	  
+		init : function( editor )
+		{ 
+			var commandName = 'embed';
+			editor.addCommand( commandName, embedCmd );
+      
+			editor.ui.addButton( 'Embed',
+				{
+					label : editor.lang.embed.button,
+					command : commandName,
+					icon: this.path + "images/embed.png"
+				});
      
+			CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/embed.js' ) );
+		}
+	});
+	
+})();

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/dialogs/attachment.js

@@ -0,0 +1 @@
+(function(){CKEDITOR.dialog.add('attachment',function(editor){var selectableTargets=/^(_(?:self|top|parent|blank))$/;var parseLink=function(editor,element){var href=element?(element.getAttribute('_cke_saved_href')||element.getAttribute('href')):'',emailMatch,anchorMatch,urlMatch,retval={};retval.type='url';retval.url=href;if(element){var target=element.getAttribute('target');retval.target={};if(target){var targetMatch=target.match(selectableTargets);if(targetMatch)retval.target.type=retval.target.name=target;else{retval.target.type='frame';retval.target.name=target}}var me=this;retval.title=element.getAttribute('title')}var elements=editor.document.getElementsByTag('img'),realAnchors=new CKEDITOR.dom.nodeList(editor.document.$.anchors),anchors=retval.anchors=[];for(var i=0;i<elements.count();i++){var item=elements.getItem(i);if(item.getAttribute('_cke_realelement')&&item.getAttribute('_cke_real_element_type')=='anchor'){anchors.push(editor.restoreRealElement(item))}}for(i=0;i<realAnchors.count();i++)anchors.push(realAnchors.getItem(i));for(i=0;i<anchors.length;i++){item=anchors[i];anchors[i]={name:item.getAttribute('name'),id:item.getAttribute('id')}}this._.selectedElement=element;return retval};var targetChanged=function(){var dialog=this.getDialog(),targetName=dialog.getContentElement('general','linkTargetName'),value=this.getValue();if(!targetName)return;targetName.setLabel(editor.lang.link.targetFrameName);this.getDialog().setValueOf('general','linkTargetName',value.charAt(0)=='_'?value:'')};function parseUrl(url){var filename=url.split('/').pop();var extname=filename.split('.').pop();return{filename:filename,className:"attach_"+extname}}return{title:editor.lang.attachment.title,minWidth:420,minHeight:200,onShow:function(){this.fakeObj=false;var editor=this.getParentEditor(),selection=editor.getSelection(),ranges=selection.getRanges(),element=null,me=this;if(ranges.length==1){var rangeRoot=ranges[0].getCommonAncestor(true);element=rangeRoot.getAscendant('a',true);if(element&&element.getAttribute('href')){selection.selectElement(element)}else if((element=rangeRoot.getAscendant('img',true))&&element.getAttribute('_cke_real_element_type')&&element.getAttribute('_cke_real_element_type')=='anchor'){this.fakeObj=element;element=editor.restoreRealElement(this.fakeObj);selection.selectElement(this.fakeObj)}else element=null}this.setupContent(parseLink.apply(this,[editor,element]))},onOk:function(){var attributes={href:'javascript:void(0)/*'+CKEDITOR.tools.getNextNumber()+'*/'},removeAttributes=[],data={href:attributes.href},me=this,editor=this.getParentEditor();this.commitContent(data);var url=data.url||'';attributes._cke_saved_href=(url.indexOf('/')===0)?url:"http://"+url;var file=parseUrl(url);var title=data.title||'';attributes.title=(data.title.length==0)?file.filename:data.title;attributes.class=file.className;if(data.target){if(data.target.type!='notSet'&&data.target.name)attributes.target=data.target.name;else removeAttributes.push('target');removeAttributes.push('_cke_pa_onclick','onclick')}if(!this._.selectedElement){var selection=editor.getSelection(),ranges=selection.getRanges();if(ranges.length==1&&ranges[0].collapsed){var text=new CKEDITOR.dom.text(attributes.title,editor.document);ranges[0].insertNode(text);ranges[0].selectNodeContents(text);selection.selectRanges(ranges)}var style=new CKEDITOR.style({element:'a',attributes:attributes});style.type=CKEDITOR.STYLE_INLINE;style.apply(editor.document)}else{var element=this._.selectedElement;if(CKEDITOR.env.ie&&attributes.name!=element.getAttribute('name')){var newElement=new CKEDITOR.dom.element('<a name="'+CKEDITOR.tools.htmlEncode(attributes.name)+'">',editor.document);selection=editor.getSelection();element.moveChildren(newElement);element.copyAttributes(newElement,{name:1});newElement.replace(element);element=newElement;selection.selectElement(element)}element.setAttributes(attributes);element.removeAttributes(removeAttributes);if(element.getAttribute('title'))element.setHtml(element.getAttribute('title'));if(element.getAttribute('name'))element.addClass('cke_anchor');else element.removeClass('cke_anchor');if(this.fakeObj)editor.createFakeElement(element,'cke_anchor','anchor').replace(this.fakeObj);delete this._.selectedElement}},contents:[{label:editor.lang.common.generalTab,id:'general',accessKey:'I',elements:[{type:'vbox',padding:0,children:[{type:'html',html:'<span>'+CKEDITOR.tools.htmlEncode(editor.lang.attachment.url)+'</span>'},{type:'hbox',widths:['280px','110px'],align:'right',children:[{id:'src',type:'text',label:'',validate:CKEDITOR.dialog.validate.notEmpty(editor.lang.flash.validateSrc),setup:function(data){if(data.url)this.setValue(data.url);this.select()},commit:function(data){data.url=this.getValue()}},{type:'button',id:'browse',filebrowser:'general:src',hidden:true,align:'center',label:editor.lang.common.browseServer}]}]},{type:'vbox',padding:0,children:[{id:'name',type:'text',label:editor.lang.attachment.name,setup:function(data){if(data.title)this.setValue(data.title)},commit:function(data){data.title=this.getValue()}}]},{type:'hbox',widths:['50%','50%'],children:[{type:'select',id:'linkTargetType',label:editor.lang.link.target,'default':'notSet',style:'width : 100%;','items':[[editor.lang.link.targetNotSet,'notSet'],[editor.lang.link.targetFrame,'frame'],[editor.lang.link.targetNew,'_blank'],[editor.lang.link.targetTop,'_top'],[editor.lang.link.targetSelf,'_self'],[editor.lang.link.targetParent,'_parent']],onChange:targetChanged,setup:function(data){if(data.target)this.setValue(data.target.type)},commit:function(data){if(!data.target)data.target={};data.target.type=this.getValue()}},{type:'text',id:'linkTargetName',label:editor.lang.link.targetFrameName,'default':'',setup:function(data){if(data.target)this.setValue(data.target.name)},commit:function(data){if(!data.target)data.target={};data.target.name=this.getValue()}}]}]},{id:'Upload',hidden:true,filebrowser:'uploadButton',label:editor.lang.common.upload,elements:[{type:'file',id:'upload',label:editor.lang.common.upload,size:38},{type:'fileButton',id:'uploadButton',label:editor.lang.common.uploadSubmit,filebrowser:'general:src','for':['Upload','upload']}]},]}})})();

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/en.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'en',
+{
+  attachment : 
+  {
+    title : "Insert attachment",
+    url: "URL",
+    name: "Title",
+    button : "Insert attachment"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/ru.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'ru',
+{
+  attachment : 
+  {
+    title : "Включить вложения",
+    url: "URL",
+    name: "Название",
+    button : "Вставить"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/uk.js

@@ -0,0 +1,10 @@
+CKEDITOR.plugins.setLang('attachment', 'uk',
+{
+  attachment : 
+  {
+    title : "Вставити файл",
+    url: "URL",
+    name: "Назва",
+    button : "Вставити"
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/plugin.js

@@ -0,0 +1 @@
+(function(){var attachmentCmd={exec:function(editor){editor.openDialog('attachment');return}};CKEDITOR.plugins.add('attachment',{lang:['en','ru','uk'],requires:['dialog'],init:function(editor){var commandName='attachment';editor.addCommand(commandName,attachmentCmd);editor.ui.addButton('Attachment',{label:editor.lang.attachment.button,command:commandName,icon:this.path+"images/attachment.png"});CKEDITOR.dialog.add(commandName,CKEDITOR.getUrl(this.path+'dialogs/attachment.js'))}})})();

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/dialogs/embed.js

@@ -0,0 +1 @@
+(function(){CKEDITOR.dialog.add('embed',function(editor){return{title:editor.lang.embed.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?368:350,minHeight:240,onShow:function(){this.getContentElement('general','content').getInputElement().setValue('')},onOk:function(){var text=this.getContentElement('general','content').getInputElement().getValue();this.getParentEditor().insertHtml(text)},contents:[{label:editor.lang.common.generalTab,id:'general',elements:[{type:'html',id:'pasteMsg',html:'<div style="white-space:normal;width:340px;">'+editor.lang.embed.pasteMsg+'</div>'},{type:'html',id:'content',style:'width:340px;height:170px',html:'<textarea style="'+'width:346px;'+'height:170px;'+'resize: none;'+'border:1px solid black;'+'background-color:white">'+'</textarea>',focus:function(){this.getElement().focus()}}]}]}})})();

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/en.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'en',
+{
+  embed : 
+  {
+    title : "Paste embed",
+    button : "Paste embed",
+    pasteMsg : "Please, paste embed-code from Youtube, Myspace, Flickr and others sources into rectangle, using the keyboard (Ctrl + V), and click OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/ru.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'ru',
+{
+  embed : 
+  {
+    title : "Вставить embed",
+    button : "Вставить embed",
+    pasteMsg : "Пожалуйста, вставьте embed-код с Youtube, Myspace, Flickr и других ресурсов в прямоугольник, используя сочетание клавиш (Ctrl+V), и нажмите OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/uk.js

@@ -0,0 +1,9 @@
+CKEDITOR.plugins.setLang('embed', 'uk',
+{
+  embed : 
+  {
+    title : "Вставити embed",
+    button : "Вставити embed",
+    pasteMsg : "Будь ласка, вставте embed-код з Youtube, Myspace, Flickr та інших ресурсів в прямокутник, використовуючи (Ctrl+V), та нажміть OK."
+  }
+});

data/lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/plugin.js

@@ -0,0 +1 @@
+(function(){var embedCmd={exec:function(editor){editor.openDialog('embed');return}};CKEDITOR.plugins.add('embed',{lang:['en','ru','uk'],requires:['dialog'],init:function(editor){var commandName='embed';editor.addCommand(commandName,embedCmd);editor.ui.addButton('Embed',{label:editor.lang.embed.button,command:commandName,icon:this.path+"images/embed.png"});CKEDITOR.dialog.add(commandName,CKEDITOR.getUrl(this.path+'dialogs/embed.js'))}})})();

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ckeditor
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 3
   - 5
-  - 1
-  version: 3.5.1
+  - 2
+  version: 3.5.2
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +02:00
+date: 2011-03-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,18 @@ files:
 - lib/generators/ckeditor/base/USAGE
 - lib/generators/ckeditor/base/base_generator.rb
 - lib/generators/ckeditor/base/templates/ckeditor.rb
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/dialogs/attachment.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/images/attachment.png
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/en.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/ru.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/lang/uk.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/attachment/plugin.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/dialogs/embed.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/images/embed.png
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/en.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/ru.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/lang/uk.js
+- lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/embed/plugin.js
 - lib/generators/ckeditor/base/templates/ckeditor/config.js
 - lib/generators/ckeditor/base/templates/ckeditor/css/ckfinder.css
 - lib/generators/ckeditor/base/templates/ckeditor/css/fck_dialog.css
@@ -88,6 +100,18 @@ files:
 - lib/generators/ckeditor/base/templates/ckeditor/images/swf.gif
 - lib/generators/ckeditor/base/templates/ckeditor/images/toolbar.start.gif
 - lib/generators/ckeditor/base/templates/ckeditor/images/xls.gif
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/dialogs/attachment.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/images/attachment.png
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/en.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/ru.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/lang/uk.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/attachment/plugin.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/dialogs/embed.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/images/embed.png
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/en.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/ru.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/lang/uk.js
+- lib/generators/ckeditor/base/templates/ckeditor/plugins/embed/plugin.js
 - lib/generators/ckeditor/base/templates/ckeditor/swfupload/fileprogress.js
 - lib/generators/ckeditor/base/templates/ckeditor/swfupload/handlers.js
 - lib/generators/ckeditor/base/templates/ckeditor/swfupload/jquery-1.5.1.min.js