refinerycms-ckeditor 0.1.4 → 0.2.0

data/app/assets/javascripts/ckeditor/_source/plugins/devtools/lang/zh-cn.js

@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'devtools', 'zh-cn',
+{
+	devTools :
+	{
+		title		: '元素信息',
+		dialogName	: '对话框窗口名称',
+		tabName		: 'Tab 名称',
+		elementId	: '元素 ID',
+		elementType	: '元素类型'
+	}
+});

data/app/assets/javascripts/ckeditor/_source/plugins/devtools/plugin.js

@@ -1,11 +1,11 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
 CKEDITOR.plugins.add( 'devtools',
 {
-	lang : [ 'en' ],
+	lang : [ 'bg', 'cs', 'cy', 'da', 'de', 'el', 'en', 'eo', 'et', 'fa', 'fi', 'fr', 'gu', 'he', 'hr', 'it', 'nb', 'nl', 'no', 'pl', 'tr', 'ug', 'uk', 'vi', 'zh-cn' ],
 
 	init : function( editor )
 	{

data/app/assets/javascripts/ckeditor/_source/plugins/dialog/dialogDefinition.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/dialog/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -138,7 +138,10 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
 			defaultDefinition = CKEDITOR.tools.clone( defaultDialogDefinition ),
 			buttonsOrder = editor.config.dialog_buttonsOrder || 'OS',
-			dir = editor.lang.dir;
+			dir = editor.lang.dir,
+			tabsToRemove = {},
+			i,
+			processed;
 
 			if ( ( buttonsOrder == 'OS' && CKEDITOR.env.mac ) ||    // The buttons in MacOS Apps are in reverse order (#4750)
 				( buttonsOrder == 'rtl' && dir == 'ltr' ) ||
@@ -219,7 +222,6 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 			}
 			, editor ).definition;
 
-		var tabsToRemove = {};
 		// Cache tabs that should be removed.
 		if ( !( 'removeDialogTabs' in editor._ ) && editor.config.removeDialogTabs )
 		{
@@ -358,10 +360,11 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				focusList[ i ].focusIndex = i;
 		}
 
-		function changeFocus( forward )
+		function changeFocus( offset )
 		{
-			var focusList = me._.focusList,
-				offset = forward ? 1 : -1;
+			var focusList = me._.focusList;
+			offset = offset || 0;
+
 			if ( focusList.length < 1 )
 				return;
 
@@ -377,12 +380,13 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 
 			var startIndex = ( current + offset + focusList.length ) % focusList.length,
 				currentIndex = startIndex;
-			while ( !focusList[ currentIndex ].isFocusable() )
+			while ( offset && !focusList[ currentIndex ].isFocusable() )
 			{
 				currentIndex = ( currentIndex + offset + focusList.length ) % focusList.length;
 				if ( currentIndex == startIndex )
 					break;
 			}
+
 			focusList[ currentIndex ].focus();
 
 			// Select whole field content.
@@ -392,7 +396,6 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 
 		this.changeFocus = changeFocus;
 
-		var processed;
 
 		function focusKeydownHandler( evt )
 		{
@@ -419,7 +422,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				else
 				{
 					// Change the focus of inputs.
-					changeFocus( !shiftPressed );
+					changeFocus( shiftPressed ? -1 : 1 );
 				}
 
 				processed = 1;
@@ -444,7 +447,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				this.selectPage( this._.currentTabId );
 				this._.tabBarMode = false;
 				this._.currentFocusIndex = -1;
-				changeFocus( true );
+				changeFocus( 1 );
 				processed = 1;
 			}
 
@@ -512,7 +515,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 					}
 					// Focus the first field in layout order.
 					else
-						changeFocus( true );
+						changeFocus( 1 );
 
 					/*
 					 * IE BUG: If the initial focus went into a non-text element (e.g. button),
@@ -558,7 +561,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title );
 
 		// Insert the tabs and contents.
-		for ( var i = 0 ; i < definition.contents.length ; i++ )
+		for ( i = 0 ; i < definition.contents.length ; i++ )
 		{
 			var page = definition.contents[i];
 			page && this.addPage( page );
@@ -578,7 +581,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 						{
 							this._.tabBarMode = false;
 							this._.currentFocusIndex = -1;
-							changeFocus( true );
+							changeFocus( 1 );
 						}
 						evt.data.preventDefault();
 					}
@@ -794,19 +797,12 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 			this._.element.getFirst().setStyle( 'z-index', CKEDITOR.dialog._.currentZIndex += 10 );
 
 			// Maintain the dialog ordering and dialog cover.
-			// Also register key handlers if first dialog.
 			if ( CKEDITOR.dialog._.currentTop === null )
 			{
 				CKEDITOR.dialog._.currentTop = this;
 				this._.parentDialog = null;
 				showCover( this._.editor );
 
-				element.on( 'keydown', accessKeyDownHandler );
-				element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
-
-				// Prevent some keys from bubbling up. (#4269)
-				for ( var event in { keyup :1, keydown :1, keypress :1 } )
-					element.on( event, preventKeyBubbling );
 			}
 			else
 			{
@@ -816,10 +812,25 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				CKEDITOR.dialog._.currentTop = this;
 			}
 
+			element.on( 'keydown', accessKeyDownHandler );
+			element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
+
+			// Prevent some keys from bubbling up. (#4269)
+			for ( var event in { keyup :1, keydown :1, keypress :1 } )
+				element.on( event, preventKeyBubbling );
+
 			// Register the Esc hotkeys.
 			registerAccessKey( this, this, '\x1b', null, function()
 					{
-						this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click();
+						var button = this.getButton( 'cancel' );
+						// If there's a Cancel button, click it, else just fire the cancel event and hide the dialog
+						if ( button )
+							button.click();
+						else
+						{
+							if ( this.fire( 'cancel', { hide : true } ).hide !== false )
+								this.hide();
+						}
 					} );
 
 			// Reset the hasFocus state.
@@ -2935,7 +2946,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		{
 			// Special treatment for Opera. (#8031)
 			CKEDITOR.env.opera ?
-				CKEDITOR.tools.setTimeout( function() { editor.openDialog( this.dialogName ) }, 0, this )
+				CKEDITOR.tools.setTimeout( function() { editor.openDialog( this.dialogName ); }, 0, this )
 				: editor.openDialog( this.dialogName );
 		},
 

data/app/assets/javascripts/ckeditor/_source/plugins/dialogadvtab/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/dialogui/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -224,7 +224,7 @@ CKEDITOR.plugins.add( 'dialogui' );
 
 				initPrivateObject.call( this, elementDefinition );
 				var domId = this._.inputId = CKEDITOR.tools.getNextId() + '_textInput',
-					attributes = { 'class' : 'cke_dialog_ui_input_' + elementDefinition.type, id : domId, type : 'text' },
+					attributes = { 'class' : 'cke_dialog_ui_input_' + elementDefinition.type, id : domId, type : elementDefinition.type },
 					i;
 
 				// Set the validator, if any.
@@ -855,7 +855,9 @@ CKEDITOR.plugins.add( 'dialogui' );
 				var innerHTML = function()
 				{
 					var html = [];
-					legendLabel && html.push( '<legend>' + legendLabel + '</legend>' );
+					legendLabel && html.push( '<legend' +
+						( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) +
+						'>' + legendLabel + '</legend>' );
 					for ( var i = 0; i < childHtmlList.length; i++ )
 						html.push( childHtmlList[ i ] );
 					return html.join( '' );
@@ -969,7 +971,13 @@ CKEDITOR.plugins.add( 'dialogui' );
 						/** @ignore */
 						onClick : function( dialog, func )
 						{
-							this.on( 'click', func );
+							this.on( 'click', function()
+								{
+									// Some browsers (Chrome, IE8, IE7 compat mode) don't move
+									// focus to clicked button. Force this.
+									this.getElement().focus();
+									func.apply( this, arguments );
+								});
 						}
 					}, true ),
 

data/app/assets/javascripts/ckeditor/_source/plugins/div/dialogs/div.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.html or http://ckeditor.com/license
  */
 

data/app/assets/javascripts/ckeditor/_source/plugins/div/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/docprops/dialogs/docprops.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/docprops/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/domiterator/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -63,7 +63,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 			var removePreviousBr, removeLastBr;
 
 			// This is the first iteration. Let's initialize it.
-			if ( !this._.lastNode )
+			if ( !this._.started )
 			{
 				range = this.range.clone();
 
@@ -76,44 +76,49 @@ CKEDITOR.plugins.add( 'domiterator' );
 				range.enlarge( this.forceBrBreak && !touchPre || !this.enlargeBr ?
 							   CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
-				var walker = new CKEDITOR.dom.walker( range ),
-					ignoreBookmarkTextEvaluator = CKEDITOR.dom.walker.bookmark( true, true );
-				// Avoid anchor inside bookmark inner text.
-				walker.evaluator = ignoreBookmarkTextEvaluator;
-				this._.nextNode = walker.next();
-				// TODO: It's better to have walker.reset() used here.
-				walker = new CKEDITOR.dom.walker( range );
-				walker.evaluator = ignoreBookmarkTextEvaluator;
-				var lastNode = walker.previous();
-				this._.lastNode = lastNode.getNextSourceNode( true );
-
-				// We may have an empty text node at the end of block due to [3770].
-				// If that node is the lastNode, it would cause our logic to leak to the
-				// next block.(#3887)
-				if ( this._.lastNode &&
-						this._.lastNode.type == CKEDITOR.NODE_TEXT &&
-						!CKEDITOR.tools.trim( this._.lastNode.getText() ) &&
-						this._.lastNode.getParent().isBlockBoundary() )
+				if ( !range.collapsed )
 				{
-					var testRange = new CKEDITOR.dom.range( range.document );
-					testRange.moveToPosition( this._.lastNode, CKEDITOR.POSITION_AFTER_END );
-					if ( testRange.checkEndOfBlock() )
+					var walker = new CKEDITOR.dom.walker( range.clone() ),
+						ignoreBookmarkTextEvaluator = CKEDITOR.dom.walker.bookmark( true, true );
+					// Avoid anchor inside bookmark inner text.
+					walker.evaluator = ignoreBookmarkTextEvaluator;
+					this._.nextNode = walker.next();
+					// TODO: It's better to have walker.reset() used here.
+					walker = new CKEDITOR.dom.walker( range.clone() );
+					walker.evaluator = ignoreBookmarkTextEvaluator;
+					var lastNode = walker.previous();
+					this._.lastNode = lastNode.getNextSourceNode( true );
+
+					// We may have an empty text node at the end of block due to [3770].
+					// If that node is the lastNode, it would cause our logic to leak to the
+					// next block.(#3887)
+					if ( this._.lastNode &&
+							this._.lastNode.type == CKEDITOR.NODE_TEXT &&
+							!CKEDITOR.tools.trim( this._.lastNode.getText() ) &&
+							this._.lastNode.getParent().isBlockBoundary() )
 					{
-						var path = new CKEDITOR.dom.elementPath( testRange.endContainer );
-						var lastBlock = path.block || path.blockLimit;
-						this._.lastNode = lastBlock.getNextSourceNode( true );
+						var testRange = new CKEDITOR.dom.range( range.document );
+						testRange.moveToPosition( this._.lastNode, CKEDITOR.POSITION_AFTER_END );
+						if ( testRange.checkEndOfBlock() )
+						{
+							var path = new CKEDITOR.dom.elementPath( testRange.endContainer );
+							var lastBlock = path.block || path.blockLimit;
+							this._.lastNode = lastBlock.getNextSourceNode( true );
+						}
 					}
-				}
 
-				// Probably the document end is reached, we need a marker node.
-				if ( !this._.lastNode )
-				{
-					this._.lastNode = this._.docEndMarker = range.document.createText( '' );
-					this._.lastNode.insertAfter( lastNode );
+					// Probably the document end is reached, we need a marker node.
+					if ( !this._.lastNode )
+					{
+						this._.lastNode = this._.docEndMarker = range.document.createText( '' );
+						this._.lastNode.insertAfter( lastNode );
+					}
+
+					// Let's reuse this variable.
+					range = null;
 				}
 
-				// Let's reuse this variable.
-				range = null;
+				this._.started = 1;
 			}
 
 			var currentNode = this._.nextNode;
@@ -279,7 +284,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 						range.insertNode( block );
 
 						removePreviousBr = removeLastBr = true;
-					}
+				}
 				else if ( block.getName() != 'li' )
 				{
 					// If the range doesn't includes the entire contents of the
@@ -346,7 +351,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 			// next interation.
 			if ( !this._.nextNode )
 			{
-				this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
+				this._.nextNode = ( isLast || block.equals( lastNode ) || !lastNode ) ? null :
 					getNextSourceNode( block, 1, lastNode );
 			}
 

data/app/assets/javascripts/ckeditor/_source/plugins/editingblock/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/elementspath/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/enterkey/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/plugins/entities/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -62,10 +62,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				shy		: '\u00AD',		// IE
 				gt		: '\u003E',		// IE | FF |   --   | Opera
 				lt		: '\u003C',		// IE | FF | Safari | Opera
-				amp : '\u0026'		// ALL
+				amp 	: '\u0026',		// ALL
+				apos 	: '\u0027',		// IE
+				quot 	: '\u0022'		// IE
 			};
 
-		entities = entities.replace( /\b(nbsp|shy|gt|lt|amp)(?:,|$)/g, function( match, entity )
+		entities = entities.replace( /\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g, function( match, entity )
 			{
 				var org = reverse ? '&' + entity + ';' : specialTable[ entity ],
 					result = reverse ? specialTable[ entity ] : '&' + entity + ';';
@@ -114,25 +116,27 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			if ( htmlFilter )
 			{
 				// Mandatory HTML base entities.
-				var selectedEntities = '';
+				var selectedEntities = [];
 
 				if ( config.basicEntities !== false )
-					selectedEntities += htmlbase;
+					selectedEntities.push( htmlbase );
 
 				if ( config.entities )
 				{
-					selectedEntities += ',' + entities;
+					if ( selectedEntities.length )
+						selectedEntities.push( entities );
+
 					if ( config.entities_latin )
-						selectedEntities += ',' + latin;
+						selectedEntities.push( latin );
 
 					if ( config.entities_greek )
-						selectedEntities += ',' + greek;
+						selectedEntities.push( greek );
 
 					if ( config.entities_additional )
-						selectedEntities += ',' + config.entities_additional;
+						selectedEntities.push( config.entities_additional );
 				}
 
-				var entitiesTable = buildTable( selectedEntities );
+				var entitiesTable = buildTable( selectedEntities.join( ',' ) );
 
 				// Create the Regex used to find entities in the text, leave it matches nothing if entities are empty.
 				var entitiesRegex = entitiesTable.regex ? '[' + entitiesTable.regex + ']' : 'a^';