glebtv-ckeditor 4.0.2.2 → 4.0.2.4

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 

data/lib/ckeditor.rb

@@ -1,10 +1,6 @@
 require 'orm_adapter'
 require 'pathname'
 
-if Object.const_defined?("RailsAdmin")
-  require "ckeditor/rails_admin/config/fields/types/ckeditor"
-end
-
 module Ckeditor
   IMAGE_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/pjpeg', 'image/tiff', 'image/x-png']
   
@@ -80,3 +76,7 @@ end
 
 require 'ckeditor/engine'
 require 'ckeditor/version'
+
+if Object.const_defined?("RailsAdmin")
+  require "ckeditor/rails_admin/field"
+end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.0.2.2".freeze
+    GEM = "4.0.2.4".freeze
     EDITOR = "4.0.2".freeze
   end
 end

data/vendor/assets/javascripts/ckeditor/config.js.erb

@@ -28,7 +28,7 @@ CKEDITOR.editorConfig = function( config )
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
   config.stylesSet = [];
-  config.extraPlugins = "font,magicline,codemirror,mediaembed,stylesheetparser,LoremIpsum,CKCss";
+  config.extraPlugins = "colordialog,font,magicline,codemirror,mediaembed,stylesheetparser,LoremIpsum,CKCss";
   config.contentsCss = "<%= stylesheet_path('ckcontent.css') %>";
 
     // Rails CSRF token

data/vendor/assets/javascripts/ckeditor/plugins/CKCss/dialogs/ckcss.js

@@ -675,16 +675,14 @@
                                     },
                                     {
                                         type: 'button',
-                                        id: 'colorChoose',
+                                        id: 'txcolorChoose',
                                         label: editor.lang.CKCss.choose,
                                         style: 'margin-left: 10px',
                                         onClick: function () {
                                             var self = this;
-                                            getDialogValue('colordialog', function (colorDialog) {
+                                            editor.getColorFromDialog(function(val) {
                                                 var destElem = self.getDialog().getContentElement('page1', 'color');
-                                                destElem.setValue(
-                                                    colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                );
+                                                destElem.setValue(val);
                                                 preview(destElem);
                                             });
                                         }
@@ -1019,16 +1017,14 @@
                                     },
                                     {
                                         type: 'button',
-                                        id: 'colorChoose',
+                                        id: 'bgcolorChoose',
                                         label: editor.lang.CKCss.choose,
                                         style: 'margin-left: 10px',
                                         onClick: function () {
                                             var self = this;
-                                            getDialogValue('colordialog', function (colorDialog) {
+                                            editor.getColorFromDialog(function(val) {
                                                 var destElem = self.getDialog().getContentElement('page3', 'backgroundColor');
-                                                destElem.setValue(
-                                                    colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                );
+                                                destElem.setValue(val);
                                                 preview(destElem);
                                             });
                                         }
@@ -1383,16 +1379,14 @@
                                             },
                                             {
                                                 type: 'button',
-                                                id: 'colorChoose',
+                                                id: 'btcolorChoose',
                                                 label: editor.lang.CKCss.choose,
                                                 style: 'margin-left: 10px',
                                                 onClick: function () {
                                                     var self = this;
-                                                    getDialogValue('colordialog', function (colorDialog) {
+                                                    editor.getColorFromDialog(function(val) {
                                                         var destElem = self.getDialog().getContentElement('page4', 'borderTopColor');
-                                                        destElem.setValue(
-                                                            colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                        );
+                                                        destElem.setValue(val);
                                                         preview(destElem);
                                                         var dialog = destElem.getDialog();
                                                         var elem = dialog.getContentElement('page4', 'borderColorAll');
@@ -1485,16 +1479,14 @@
                                             },
                                             {
                                                 type: 'button',
-                                                id: 'colorChoose',
+                                                id: 'brcolorChoose',
                                                 label: editor.lang.CKCss.choose,
                                                 style: 'margin-left: 10px',
                                                 onClick: function () {
                                                     var self = this;
-                                                    getDialogValue('colordialog', function (colorDialog) {
+                                                    editor.getColorFromDialog(function(val) {
                                                         var destElem = self.getDialog().getContentElement('page4', 'borderRightColor');
-                                                        destElem.setValue(
-                                                            colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                        );
+                                                        destElem.setValue(val);
                                                         preview(destElem);
                                                     });
                                                 }
@@ -1584,16 +1576,14 @@
                                             },
                                             {
                                                 type: 'button',
-                                                id: 'colorChoose',
+                                                id: 'bbcolorChoose',
                                                 label: editor.lang.CKCss.choose,
                                                 style: 'margin-left: 10px',
                                                 onClick: function () {
                                                     var self = this;
-                                                    getDialogValue('colordialog', function (colorDialog) {
+                                                    editor.getColorFromDialog(function(val) {
                                                         var destElem = self.getDialog().getContentElement('page4', 'borderBottomColor');
-                                                        destElem.setValue(
-                                                            colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                        );
+                                                        destElem.setValue(val);
                                                         preview(destElem);
                                                     });
                                                 }
@@ -1683,16 +1673,14 @@
                                             },
                                             {
                                                 type: 'button',
-                                                id: 'colorChoose',
+                                                id: 'blcolorChoose',
                                                 label: editor.lang.CKCss.choose,
                                                 style: 'margin-left: 10px',
                                                 onClick: function () {
                                                     var self = this;
-                                                    getDialogValue('colordialog', function (colorDialog) {
+                                                    editor.getColorFromDialog(function(val) {
                                                         var destElem = self.getDialog().getContentElement('page4', 'borderLeftColor');
-                                                        destElem.setValue(
-                                                            colorDialog.getContentElement('picker', 'selectedColor').getValue()
-                                                        );
+                                                        destElem.setValue(val);
                                                         preview(destElem);
                                                     });
                                                 }

data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js

@@ -0,0 +1,340 @@
+/**
+ * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+CKEDITOR.dialog.add( 'colordialog', function( editor ) {
+	// Define some shorthands.
+	var $el = CKEDITOR.dom.element,
+		$doc = CKEDITOR.document,
+		lang = editor.lang.colordialog;
+
+	// Reference the dialog.
+	var dialog;
+
+	var spacer = {
+		type: 'html',
+		html: ' '
+	};
+
+	var selected;
+
+	function clearSelected() {
+		$doc.getById( selHiColorId ).removeStyle( 'background-color' );
+		dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' );
+		selected && selected.removeAttribute( 'aria-selected' );
+		selected = null;
+	}
+
+	function updateSelected( evt ) {
+		var target = evt.data.getTarget(),
+			color;
+
+		if ( target.getName() == 'td' && ( color = target.getChild( 0 ).getHtml() ) ) {
+			selected = target;
+			selected.setAttribute( 'aria-selected', true );
+			dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color );
+		}
+	}
+
+	// Basing black-white decision off of luma scheme using the Rec. 709 version
+	function whiteOrBlack( color ) {
+		color = color.replace( /^#/, '' );
+		for ( var i = 0, rgb = []; i <= 2; i++ )
+			rgb[ i ] = parseInt( color.substr( i * 2, 2 ), 16 );
+		var luma = ( 0.2126 * rgb[ 0 ] ) + ( 0.7152 * rgb[ 1 ] ) + ( 0.0722 * rgb[ 2 ] );
+		return '#' + ( luma >= 165 ? '000' : 'fff' );
+	}
+
+	// Distinguish focused and hover states.
+	var focused, hovered;
+
+	// Apply highlight style.
+	function updateHighlight( event ) {
+		// Convert to event.
+		!event.name && ( event = new CKEDITOR.event( event ) );
+
+		var isFocus = !( /mouse/ ).test( event.name ),
+			target = event.data.getTarget(),
+			color;
+
+		if ( target.getName() == 'td' && ( color = target.getChild( 0 ).getHtml() ) ) {
+			removeHighlight( event );
+
+			isFocus ? focused = target : hovered = target;
+
+			// Apply outline style to show focus.
+			if ( isFocus ) {
+				target.setStyle( 'border-color', whiteOrBlack( color ) );
+				target.setStyle( 'border-style', 'dotted' );
+			}
+
+			$doc.getById( hicolorId ).setStyle( 'background-color', color );
+			$doc.getById( hicolorTextId ).setHtml( color );
+		}
+	}
+
+	function clearHighlight() {
+		var color = focused.getChild( 0 ).getHtml();
+		focused.setStyle( 'border-color', color );
+		focused.setStyle( 'border-style', 'solid' );
+		$doc.getById( hicolorId ).removeStyle( 'background-color' );
+		$doc.getById( hicolorTextId ).setHtml( '&nbsp;' );
+		focused = null;
+	}
+
+	// Remove previously focused style.
+	function removeHighlight( event ) {
+		var isFocus = !( /mouse/ ).test( event.name ),
+			target = isFocus && focused;
+
+		if ( target ) {
+			var color = target.getChild( 0 ).getHtml();
+			target.setStyle( 'border-color', color );
+			target.setStyle( 'border-style', 'solid' );
+		}
+
+		if ( !( focused || hovered ) ) {
+			$doc.getById( hicolorId ).removeStyle( 'background-color' );
+			$doc.getById( hicolorTextId ).setHtml( '&nbsp;' );
+		}
+	}
+
+	function onKeyStrokes( evt ) {
+		var domEvt = evt.data;
+
+		var element = domEvt.getTarget();
+		var relative, nodeToMove;
+		var keystroke = domEvt.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
+
+		switch ( keystroke ) {
+			// UP-ARROW
+			case 38:
+				// relative is TR
+				if ( ( relative = element.getParent().getPrevious() ) ) {
+					nodeToMove = relative.getChild( [ element.getIndex() ] );
+					nodeToMove.focus();
+				}
+				domEvt.preventDefault();
+				break;
+				// DOWN-ARROW
+			case 40:
+				// relative is TR
+				if ( ( relative = element.getParent().getNext() ) ) {
+					nodeToMove = relative.getChild( [ element.getIndex() ] );
+					if ( nodeToMove && nodeToMove.type == 1 ) {
+						nodeToMove.focus();
+					}
+				}
+				domEvt.preventDefault();
+				break;
+
+				// SPACE
+				// ENTER
+			case 32:
+			case 13:
+				updateSelected( evt );
+				domEvt.preventDefault();
+				break;
+
+				// RIGHT-ARROW
+			case rtl ? 37:
+				39 :
+				// relative is TD
+				if ( ( nodeToMove = element.getNext() ) ) {
+					if ( nodeToMove.type == 1 ) {
+						nodeToMove.focus();
+						domEvt.preventDefault( true );
+					}
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getNext() ) ) {
+					nodeToMove = relative.getChild( [ 0 ] );
+					if ( nodeToMove && nodeToMove.type == 1 ) {
+						nodeToMove.focus();
+						domEvt.preventDefault( true );
+					}
+				}
+				break;
+
+				// LEFT-ARROW
+			case rtl ? 39:
+				37 :
+				// relative is TD
+				if ( ( nodeToMove = element.getPrevious() ) ) {
+					nodeToMove.focus();
+					domEvt.preventDefault( true );
+				}
+				// relative is TR
+				else if ( ( relative = element.getParent().getPrevious() ) ) {
+					nodeToMove = relative.getLast();
+					nodeToMove.focus();
+					domEvt.preventDefault( true );
+				}
+				break;
+			default:
+				// Do not stop not handled events.
+				return;
+		}
+	}
+
+	function createColorTable() {
+		table = CKEDITOR.dom.element.createFromHtml( '<table tabIndex="-1" aria-label="' + lang.options + '"' +
+			' role="grid" style="border-collapse:separate;" cellspacing="0">' +
+			'<caption class="cke_voice_label">' + lang.options + '</caption>' +
+			'<tbody role="presentation"></tbody></table>' );
+
+		table.on( 'mouseover', updateHighlight );
+		table.on( 'mouseout', removeHighlight );
+
+		// Create the base colors array.
+		var aColors = [ '00', '33', '66', '99', 'cc', 'ff' ];
+
+		// This function combines two ranges of three values from the color array into a row.
+		function appendColorRow( rangeA, rangeB ) {
+			for ( var i = rangeA; i < rangeA + 3; i++ ) {
+				var row = new $el( table.$.insertRow( -1 ) );
+				row.setAttribute( 'role', 'row' );
+
+				for ( var j = rangeB; j < rangeB + 3; j++ ) {
+					for ( var n = 0; n < 6; n++ ) {
+						appendColorCell( row.$, '#' + aColors[ j ] + aColors[ n ] + aColors[ i ] );
+					}
+				}
+			}
+		}
+
+		// This function create a single color cell in the color table.
+		function appendColorCell( targetRow, color ) {
+			var cell = new $el( targetRow.insertCell( -1 ) );
+			cell.setAttribute( 'class', 'ColorCell' );
+			cell.setAttribute( 'tabIndex', -1 );
+			cell.setAttribute( 'role', 'gridcell' );
+
+			cell.on( 'keydown', onKeyStrokes );
+			cell.on( 'click', updateSelected );
+			cell.on( 'focus', updateHighlight );
+			cell.on( 'blur', removeHighlight );
+
+			cell.setStyle( 'background-color', color );
+			cell.setStyle( 'border', '1px solid ' + color );
+
+			cell.setStyle( 'width', '14px' );
+			cell.setStyle( 'height', '14px' );
+
+			var colorLabel = numbering( 'color_table_cell' );
+			cell.setAttribute( 'aria-labelledby', colorLabel );
+			cell.append( CKEDITOR.dom.element.createFromHtml( '<span id="' + colorLabel + '" class="cke_voice_label">' + color + '</span>', CKEDITOR.document ) );
+		}
+
+		appendColorRow( 0, 0 );
+		appendColorRow( 3, 0 );
+		appendColorRow( 0, 3 );
+		appendColorRow( 3, 3 );
+
+		// Create the last row.
+		var oRow = new $el( table.$.insertRow( -1 ) );
+		oRow.setAttribute( 'role', 'row' );
+
+		// Create the gray scale colors cells.
+		for ( var n = 0; n < 6; n++ ) {
+			appendColorCell( oRow.$, '#' + aColors[ n ] + aColors[ n ] + aColors[ n ] );
+		}
+
+		// Fill the row with black cells.
+		for ( var i = 0; i < 12; i++ ) {
+			appendColorCell( oRow.$, '#000000' );
+		}
+	}
+
+	var numbering = function( id ) {
+			return CKEDITOR.tools.getNextId() + '_' + id;
+		},
+		hicolorId = numbering( 'hicolor' ),
+		hicolorTextId = numbering( 'hicolortext' ),
+		selHiColorId = numbering( 'selhicolor' ),
+		table;
+
+	createColorTable();
+
+	return {
+		title: lang.title,
+		minWidth: 360,
+		minHeight: 220,
+		onLoad: function() {
+			// Update reference.
+			dialog = this;
+		},
+		onHide: function() {
+			clearSelected();
+			clearHighlight();
+		},
+		contents: [
+			{
+			id: 'picker',
+			label: lang.title,
+			accessKey: 'I',
+			elements: [
+				{
+				type: 'hbox',
+				padding: 0,
+				widths: [ '70%', '10%', '30%' ],
+				children: [
+					{
+					type: 'html',
+					html: '<div></div>',
+					onLoad: function() {
+						CKEDITOR.document.getById( this.domId ).append( table );
+					},
+					focus: function() {
+						// Restore the previously focused cell,
+						// otherwise put the initial focus on the first table cell.
+						( focused || this.getElement().getElementsByTag( 'td' ).getItem( 0 ) ).focus();
+					}
+				},
+					spacer,
+				{
+					type: 'vbox',
+					padding: 0,
+					widths: [ '70%', '5%', '25%' ],
+					children: [
+						{
+						type: 'html',
+						html: '<span>' + lang.highlight + '</span>\
+												<div id="' + hicolorId + '" style="border: 1px solid; height: 74px; width: 74px;"></div>\
+												<div id="' + hicolorTextId + '">&nbsp;</div><span>' + lang.selected + '</span>\
+												<div id="' + selHiColorId + '" style="border: 1px solid; height: 20px; width: 74px;"></div>'
+					},
+						{
+						type: 'text',
+						label: lang.selected,
+						labelStyle: 'display:none',
+						id: 'selectedColor',
+						style: 'width: 74px',
+						onChange: function() {
+							// Try to update color preview with new value. If fails, then set it no none.
+							try {
+								$doc.getById( selHiColorId ).setStyle( 'background-color', this.getValue() );
+							} catch ( e ) {
+								clearSelected();
+							}
+						}
+					},
+						spacer,
+					{
+						type: 'button',
+						id: 'clear',
+						style: 'margin-top: 5px',
+						label: lang.clear,
+						onClick: clearSelected
+					}
+					]
+				}
+				]
+			}
+			]
+		}
+		]
+	};
+});

data/vendor/assets/javascripts/ckeditor/plugins/colordialog/lang/en.js

@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'colordialog', 'en', {
+	clear: 'Clear',
+	highlight: 'Highlight',
+	options: 'Color Options',
+	selected: 'Selected Color',
+	title: 'Select color'
+});

data/vendor/assets/javascripts/ckeditor/plugins/colordialog/lang/ru.js

@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'colordialog', 'ru', {
+	clear: 'Очистить',
+	highlight: 'Под курсором',
+	options: 'Настройки цвета',
+	selected: 'Выбранный цвет',
+	title: 'Выберите цвет'
+});

data/vendor/assets/javascripts/ckeditor/plugins/colordialog/plugin.js

@@ -0,0 +1,65 @@
+/**
+ * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+CKEDITOR.plugins.colordialog = {
+	requires: 'dialog',
+	lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh', // %REMOVE_LINE_CORE%
+	init: function( editor ) {
+		editor.addCommand( 'colordialog', new CKEDITOR.dialogCommand( 'colordialog' ) );
+		CKEDITOR.dialog.add( 'colordialog', this.path + 'dialogs/colordialog.js' );
+
+		/**
+		 * Open up color dialog and to receive the selected color.
+		 *
+		 * @param {Function} callback The callback when color dialog is closed
+		 * @param {String} callback.color The color value received if selected on the dialog.
+		 * @param [scope] The scope in which the callback will be bound.
+		 * @member CKEDITOR.editor
+		 */
+		editor.getColorFromDialog = function( callback, scope ) {
+			var onClose = function( evt ) {
+				releaseHandlers( this );
+				var color = evt.name == 'ok' ? this.getValueOf( 'picker', 'selectedColor' ) : null;
+				callback.call( scope, color );
+			};
+			var releaseHandlers = function( dialog ) {
+				dialog.removeListener( 'ok', onClose );
+				dialog.removeListener( 'cancel', onClose );
+			};
+			var bindToDialog = function( dialog ) {
+				dialog.on( 'ok', onClose );
+				dialog.on( 'cancel', onClose );
+			};
+
+			editor.execCommand( 'colordialog' );
+
+			if ( editor._.storedDialogs && editor._.storedDialogs.colordialog )
+				bindToDialog( editor._.storedDialogs.colordialog );
+			else {
+				CKEDITOR.on( 'dialogDefinition', function( e ) {
+					if ( e.data.name != 'colordialog' )
+						return;
+
+					var definition = e.data.definition;
+
+					e.removeListener();
+					definition.onLoad = CKEDITOR.tools.override( definition.onLoad,
+						function( orginal ) {
+							return function() {
+								bindToDialog( this );
+								definition.onLoad = orginal;
+								if ( typeof orginal == 'function' )
+									orginal.call( this );
+							};
+						} );
+				} );
+			}
+		};
+
+
+	}
+};
+
+CKEDITOR.plugins.add( 'colordialog', CKEDITOR.plugins.colordialog );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-ckeditor
 version: !ruby/object:Gem::Version
-  version: 4.0.2.2
+  version: 4.0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -87,7 +87,7 @@ files:
 - lib/ckeditor/http.rb
 - lib/ckeditor/hooks/formtastic.rb
 - lib/ckeditor/hooks/simple_form.rb
-- lib/ckeditor/rails_admin/config/fields/types/ckeditor.rb
+- lib/ckeditor/rails_admin/field.rb
 - lib/ckeditor/engine.rb
 - lib/ckeditor/orm/mongoid.rb
 - lib/ckeditor/orm/base.rb
@@ -143,6 +143,10 @@ files:
 - vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
 - vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
 - vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+- vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js
+- vendor/assets/javascripts/ckeditor/plugins/colordialog/plugin.js
+- vendor/assets/javascripts/ckeditor/plugins/colordialog/lang/en.js
+- vendor/assets/javascripts/ckeditor/plugins/colordialog/lang/ru.js
 - vendor/assets/javascripts/ckeditor/plugins/font/plugin.js
 - vendor/assets/javascripts/ckeditor/plugins/font/lang/en.js
 - vendor/assets/javascripts/ckeditor/plugins/font/lang/ru.js
@@ -370,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails gem for easy integration ckeditor in your application