glebtv-ckeditor 4.0.2.4 → 4.0.2.5

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.0.2.4".freeze
+    GEM = "4.0.2.5".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 = "colordialog,font,magicline,codemirror,mediaembed,stylesheetparser,LoremIpsum,CKCss";
+  config.extraPlugins = "colorbutton,colordialog,font,magicline,codemirror,mediaembed,stylesheetparser,LoremIpsum,CKCss";
   config.contentsCss = "<%= stylesheet_path('ckcontent.css') %>";
 
     // Rails CSRF token
@@ -51,7 +51,7 @@ CKEDITOR.editorConfig = function( config )
   config.toolbar_CMS =
     [
         ['Source'], ['RemoveFormat'], ['PasteText','PasteFromWord'], ['Undo','Redo'],
-        ['Styles','Format','Font','FontSize'],
+        ['Styles','Format','Font','FontSize', 'TextColor', 'BGColor'],
         ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
         '/',
         ['Bold','Italic','Underline'], ['NumberedList','BulletedList','Blockquote'],

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

@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'colorbutton', 'en', {
+	auto: 'Automatic',
+	bgColorTitle: 'Background Color',
+	colors: {
+		'000': 'Black',
+		'800000': 'Maroon',
+		'8B4513': 'Saddle Brown',
+		'2F4F4F': 'Dark Slate Gray',
+		'008080': 'Teal',
+		'000080': 'Navy',
+		'4B0082': 'Indigo',
+		'696969': 'Dark Gray',
+		B22222: 'Fire Brick',
+		A52A2A: 'Brown',
+		DAA520: 'Golden Rod',
+		'006400': 'Dark Green',
+		'40E0D0': 'Turquoise',
+		'0000CD': 'Medium Blue',
+		'800080': 'Purple',
+		'808080': 'Gray',
+		F00: 'Red',
+		FF8C00: 'Dark Orange',
+		FFD700: 'Gold',
+		'008000': 'Green',
+		'0FF': 'Cyan',
+		'00F': 'Blue',
+		EE82EE: 'Violet',
+		A9A9A9: 'Dim Gray',
+		FFA07A: 'Light Salmon',
+		FFA500: 'Orange',
+		FFFF00: 'Yellow',
+		'00FF00': 'Lime',
+		AFEEEE: 'Pale Turquoise',
+		ADD8E6: 'Light Blue',
+		DDA0DD: 'Plum',
+		D3D3D3: 'Light Grey',
+		FFF0F5: 'Lavender Blush',
+		FAEBD7: 'Antique White',
+		FFFFE0: 'Light Yellow',
+		F0FFF0: 'Honeydew',
+		F0FFFF: 'Azure',
+		F0F8FF: 'Alice Blue',
+		E6E6FA: 'Lavender',
+		FFF: 'White'
+	},
+	more: 'More Colors...',
+	panelTitle: 'Colors',
+	textColorTitle: 'Text Color'
+});

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

@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'colorbutton', 'ru', {
+	auto: 'Автоматически',
+	bgColorTitle: 'Цвет фона',
+	colors: {
+		'000': 'Чёрный',
+		'800000': 'Бордовый',
+		'8B4513': 'Кожано-коричневый',
+		'2F4F4F': 'Темный синевато-серый',
+		'008080': 'Сине-зелёный',
+		'000080': 'Тёмно-синий',
+		'4B0082': 'Индиго',
+		'696969': 'Тёмно-серый',
+		B22222: 'Кирпичный',
+		A52A2A: 'Коричневый',
+		DAA520: 'Золотисто-берёзовый',
+		'006400': 'Темно-зелёный',
+		'40E0D0': 'Бирюзовый',
+		'0000CD': 'Умеренно синий',
+		'800080': 'Пурпурный',
+		'808080': 'Серый',
+		F00: 'Красный',
+		FF8C00: 'Темно-оранжевый',
+		FFD700: 'Золотистый',
+		'008000': 'Зелёный',
+		'0FF': 'Васильковый',
+		'00F': 'Синий',
+		EE82EE: 'Фиолетовый',
+		A9A9A9: 'Тускло-серый',
+		FFA07A: 'Светло-лососевый',
+		FFA500: 'Оранжевый',
+		FFFF00: 'Жёлтый',
+		'00FF00': 'Лайма',
+		AFEEEE: 'Бледно-синий',
+		ADD8E6: 'Свелто-голубой',
+		DDA0DD: 'Сливовый',
+		D3D3D3: 'Светло-серый',
+		FFF0F5: 'Розово-лавандовый',
+		FAEBD7: 'Античный белый',
+		FFFFE0: 'Светло-жёлтый',
+		F0FFF0: 'Медвяной росы',
+		F0FFFF: 'Лазурный',
+		F0F8FF: 'Бледно-голубой',
+		E6E6FA: 'Лавандовый',
+		FFF: 'Белый'
+	},
+	more: 'Ещё цвета...',
+	panelTitle: 'Цвета',
+	textColorTitle: 'Цвет текста'
+});

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

@@ -0,0 +1,273 @@
+/**
+ * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+/**
+ * @fileOverview The "colorbutton" plugin that makes it possible to assign
+ *               text and background colors to editor contents.
+ *
+ */
+CKEDITOR.plugins.add( 'colorbutton', {
+	requires: 'panelbutton,floatpanel',
+	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%
+	icons: 'bgcolor,textcolor', // %REMOVE_LINE_CORE%
+	init: function( editor ) {
+		var config = editor.config,
+			lang = editor.lang.colorbutton;
+
+		var clickFn;
+
+		if ( !CKEDITOR.env.hc ) {
+			addButton( 'TextColor', 'fore', lang.textColorTitle, 10 );
+			addButton( 'BGColor', 'back', lang.bgColorTitle, 20 );
+		}
+
+		function addButton( name, type, title, order ) {
+			var colorBoxId = CKEDITOR.tools.getNextId() + '_colorBox';
+			editor.ui.add( name, CKEDITOR.UI_PANELBUTTON, {
+				label: title,
+				title: title,
+				modes: { wysiwyg:1 },
+				editorFocus: 1,
+				toolbar: 'colors,' + order,
+
+				panel: {
+					css: CKEDITOR.skin.getPath( 'editor' ),
+					attributes: { role: 'listbox', 'aria-label': lang.panelTitle }
+				},
+
+				onBlock: function( panel, block ) {
+					block.autoSize = true;
+					block.element.addClass( 'cke_colorblock' );
+					block.element.setHtml( renderColors( panel, type, colorBoxId ) );
+					// The block should not have scrollbars (#5933, #6056)
+					block.element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
+
+					CKEDITOR.ui.fire( 'ready', this );
+
+					var keys = block.keys;
+					var rtl = editor.lang.dir == 'rtl';
+					keys[ rtl ? 37 : 39 ] = 'next'; // ARROW-RIGHT
+					keys[ 40 ] = 'next'; // ARROW-DOWN
+					keys[ 9 ] = 'next'; // TAB
+					keys[ rtl ? 39 : 37 ] = 'prev'; // ARROW-LEFT
+					keys[ 38 ] = 'prev'; // ARROW-UP
+					keys[ CKEDITOR.SHIFT + 9 ] = 'prev'; // SHIFT + TAB
+					keys[ 32 ] = 'click'; // SPACE
+				},
+
+				// The automatic colorbox should represent the real color (#6010)
+				onOpen: function() {
+
+					var selection = editor.getSelection(),
+						block = selection && selection.getStartElement(),
+						path = editor.elementPath( block ),
+						color;
+
+					// Find the closest block element.
+					block = path.block || path.blockLimit || editor.document.getBody();
+
+					// The background color might be transparent. In that case, look up the color in the DOM tree.
+					do {
+						color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';
+					}
+					while ( type == 'back' && color == 'transparent' && block && ( block = block.getParent() ) );
+
+					// The box should never be transparent.
+					if ( !color || color == 'transparent' )
+						color = '#ffffff';
+
+					this._.panel._.iframe.getFrameDocument().getById( colorBoxId ).setStyle( 'background-color', color );
+
+					return color;
+				}
+			});
+		}
+
+
+		function renderColors( panel, type, colorBoxId ) {
+			var output = [],
+				colors = config.colorButton_colors.split( ',' );
+
+			var clickFn = CKEDITOR.tools.addFunction( function( color, type ) {
+				if ( color == '?' ) {
+					var applyColorStyle = arguments.callee;
+
+					function onColorDialogClose( evt ) {
+						this.removeListener( 'ok', onColorDialogClose );
+						this.removeListener( 'cancel', onColorDialogClose );
+
+						evt.name == 'ok' && applyColorStyle( this.getContentElement( 'picker', 'selectedColor' ).getValue(), type );
+					}
+
+					editor.openDialog( 'colordialog', function() {
+						this.on( 'ok', onColorDialogClose );
+						this.on( 'cancel', onColorDialogClose );
+					});
+
+					return;
+				}
+
+				editor.focus();
+
+				panel.hide();
+
+				editor.fire( 'saveSnapshot' );
+
+				// Clean up any conflicting style within the range.
+				editor.removeStyle( new CKEDITOR.style( config[ 'colorButton_' + type + 'Style' ], { color: 'inherit' } ) );
+
+				if ( color ) {
+					var colorStyle = config[ 'colorButton_' + type + 'Style' ];
+
+					colorStyle.childRule = type == 'back' ?
+					function( element ) {
+						// It's better to apply background color as the innermost style. (#3599)
+						// Except for "unstylable elements". (#6103)
+						return isUnstylable( element );
+					} : function( element ) {
+						// Fore color style must be applied inside links instead of around it. (#4772,#6908)
+						return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element );
+					};
+
+					editor.applyStyle( new CKEDITOR.style( colorStyle, { color: color } ) );
+				}
+
+				editor.fire( 'saveSnapshot' );
+			});
+
+			// Render the "Automatic" button.
+			output.push( '<a class="cke_colorauto" _cke_focus=1 hidefocus=true' +
+				' title="', lang.auto, '"' +
+				' onclick="CKEDITOR.tools.callFunction(', clickFn, ',null,\'', type, '\');return false;"' +
+				' href="javascript:void(\'', lang.auto, '\')"' +
+				' role="option">' +
+				'<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' +
+					'<tr>' +
+						'<td>' +
+							'<span class="cke_colorbox" id="', colorBoxId, '"></span>' +
+						'</td>' +
+						'<td colspan=7 align=center>', lang.auto, '</td>' +
+					'</tr>' +
+				'</table>' +
+				'</a>' +
+				'<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' );
+
+			// Render the color boxes.
+			for ( var i = 0; i < colors.length; i++ ) {
+				if ( ( i % 8 ) === 0 )
+					output.push( '</tr><tr>' );
+
+				var parts = colors[ i ].split( '/' ),
+					colorName = parts[ 0 ],
+					colorCode = parts[ 1 ] || colorName;
+
+				// The data can be only a color code (without #) or colorName + color code
+				// If only a color code is provided, then the colorName is the color with the hash
+				// Convert the color from RGB to RRGGBB for better compatibility with IE and <font>. See #5676
+				if ( !parts[ 1 ] )
+					colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' );
+
+				var colorLabel = editor.lang.colorbutton.colors[ colorCode ] || colorCode;
+				output.push( '<td>' +
+					'<a class="cke_colorbox" _cke_focus=1 hidefocus=true' +
+						' title="', colorLabel, '"' +
+						' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +
+						' href="javascript:void(\'', colorLabel, '\')"' +
+						' role="option">' +
+						'<span class="cke_colorbox" style="background-color:#', colorCode, '"></span>' +
+					'</a>' +
+					'</td>' );
+			}
+
+			// Render the "More Colors" button.
+			if ( editor.plugins.colordialog && config.colorButton_enableMore === undefined || config.colorButton_enableMore ) {
+				output.push( '</tr>' +
+					'<tr>' +
+						'<td colspan=8 align=center>' +
+							'<a class="cke_colormore" _cke_focus=1 hidefocus=true' +
+								' title="', lang.more, '"' +
+								' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'?\',\'', type, '\');return false;"' +
+								' href="javascript:void(\'', lang.more, '\')"', ' role="option">', lang.more, '</a>' +
+						'</td>' ); // tr is later in the code.
+			}
+
+			output.push( '</tr></table>' );
+
+			return output.join( '' );
+		}
+
+		function isUnstylable( ele ) {
+			return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
+		}
+	}
+});
+
+/**
+ * Whether to enable the **More Colors*** button in the color selectors.
+ *
+ *		config.colorButton_enableMore = false;
+ *
+ * @cfg {Boolean} [colorButton_enableMore=true]
+ * @member CKEDITOR.config
+ */
+
+/**
+ * Defines the colors to be displayed in the color selectors. This is a string
+ * containing hexadecimal notation for HTML colors, without the `'#'` prefix.
+ *
+ * **Since 3.3:** A color name may optionally be defined by prefixing the entries with
+ * a name and the slash character. For example, `'FontColor1/FF9900'` will be
+ * displayed as the color `#FF9900` in the selector, but will be output as `'FontColor1'`.
+ *
+ *		// Brazil colors only.
+ *		config.colorButton_colors = '00923E,F8C100,28166F';
+ *
+ *		config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00';
+ *
+ * @cfg {String} [colorButton_colors=see source]
+ * @member CKEDITOR.config
+ */
+CKEDITOR.config.colorButton_colors = '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' +
+	'B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,' +
+	'F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,' +
+	'FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,' +
+	'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';
+
+/**
+ * Stores the style definition that applies the text foreground color.
+ *
+ *		// This is actually the default value.
+ *		config.colorButton_foreStyle = {
+ *			element: 'span',
+ *			styles: { color: '#(color)' }
+ *		};
+ *
+ * @cfg [colorButton_foreStyle=see source]
+ * @member CKEDITOR.config
+ */
+CKEDITOR.config.colorButton_foreStyle = {
+	element: 'span',
+	styles: { 'color': '#(color)' },
+	overrides: [ {
+		element: 'font', attributes: { 'color': null }
+	}]
+};
+
+/**
+ * Stores the style definition that applies the text background color.
+ *
+ *		// This is actually the default value.
+ *		config.colorButton_backStyle = {
+ *			element: 'span',
+ *			styles: { 'background-color': '#(color)' }
+ *		};
+ *
+ * @cfg [colorButton_backStyle=see source]
+ * @member CKEDITOR.config
+ */
+CKEDITOR.config.colorButton_backStyle = {
+	element: 'span',
+	styles: { 'background-color': '#(color)' }
+};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-ckeditor
 version: !ruby/object:Gem::Version
-  version: 4.0.2.4
+  version: 4.0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -131,6 +131,11 @@ files:
 - vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js
 - vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/en.js
 - vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+- vendor/assets/javascripts/ckeditor/plugins/colorbutton/icons/bgcolor.png
+- vendor/assets/javascripts/ckeditor/plugins/colorbutton/icons/textcolor.png
+- vendor/assets/javascripts/ckeditor/plugins/colorbutton/plugin.js
+- vendor/assets/javascripts/ckeditor/plugins/colorbutton/lang/en.js
+- vendor/assets/javascripts/ckeditor/plugins/colorbutton/lang/ru.js
 - vendor/assets/javascripts/ckeditor/plugins/fakeobjects/images/spacer.gif
 - vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js
 - vendor/assets/javascripts/ckeditor/plugins/image/images/noimage.png