ckeditor 3.4.2 → 3.4.3.pre

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/list/plugin.js

@@ -80,19 +80,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				indentLevel = Math.max( listArray[ baseIndex ].indent, 0 ),
 				currentListItem = null,
 				paragraphName = ( paragraphMode == CKEDITOR.ENTER_P ? 'p' : 'div' );
-			while ( true )
+			while ( 1 )
 			{
 				var item = listArray[ currentIndex ];
 				if ( item.indent == indentLevel )
 				{
 					if ( !rootNode || listArray[ currentIndex ].parent.getName() != rootNode.getName() )
 					{
-						rootNode = listArray[ currentIndex ].parent.clone( false, true );
+						rootNode = listArray[ currentIndex ].parent.clone( false, 1 );
 						retval.append( rootNode );
 					}
-					currentListItem = rootNode.append( item.element.clone( false, true ) );
+					currentListItem = rootNode.append( item.element.clone( 0, 1 ) );
 					for ( var i = 0 ; i < item.contents.length ; i++ )
-						currentListItem.append( item.contents[i].clone( true, true ) );
+						currentListItem.append( item.contents[i].clone( 1, 1 ) );
 					currentIndex++;
 				}
 				else if ( item.indent == Math.max( indentLevel, 0 ) + 1 )
@@ -108,19 +108,26 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						currentListItem = item.element.clone( false, true );
 					else
 					{
-						// Create completely new blocks here, attributes are dropped.
-						if ( dir || ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' ) )
+						// Create completely new blocks here.
+						if ( dir || item.element.hasAttributes() ||
+							( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' ) )
 						{
 							currentListItem = doc.createElement( paragraphName );
-							if ( dir )
-								currentListItem.setAttribute( 'dir', dir );
+							item.element.copyAttributes( currentListItem, { type:1, value:1 } );
+							dir && currentListItem.setAttribute( 'dir', dir );
+
+							// There might be a case where there are no attributes in the element after all
+							// (i.e. when "type" or "value" are the only attributes set). In this case, if enterMode = BR,
+							// the current item should be a fragment.
+							if ( !dir && paragraphMode == CKEDITOR.ENTER_BR && !currentListItem.hasAttributes() )
+								currentListItem = new CKEDITOR.dom.documentFragment( doc );
 						}
 						else
 							currentListItem = new CKEDITOR.dom.documentFragment( doc );
 					}
 
 					for ( i = 0 ; i < item.contents.length ; i++ )
-						currentListItem.append( item.contents[i].clone( true, true ) );
+						currentListItem.append( item.contents[i].clone( 1, 1 ) );
 
 					if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT
 						 && currentIndex != listArray.length - 1 )
@@ -268,6 +275,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		for ( var i = 0 ; i < contents.length ; i++ )
 			commonParent = commonParent.getCommonAncestor( contents[i].getParent() );
 
+		var useComputedState = editor.config.useComputedState,
+			listDir, explicitDirection;
+
+		useComputedState = useComputedState === undefined || useComputedState;
+
 		// We want to insert things that are in the same tree level only, so calculate the contents again
 		// by expanding the selected blocks to the same tree level.
 		for ( i = 0 ; i < contents.length ; i++ )
@@ -279,6 +291,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				if ( parentNode.equals( commonParent ) )
 				{
 					listContents.push( contentNode );
+
+					// Determine the lists's direction.
+					if ( !explicitDirection && contentNode.getDirection() )
+						explicitDirection = 1;
+
+					var itemDir = contentNode.getDirection( useComputedState );
+
+					if ( listDir !== null )
+					{
+						// If at least one LI have a different direction than current listDir, we can't have listDir.
+						if ( listDir && listDir != itemDir )
+							listDir = null;
+						else
+							listDir = itemDir;
+					}
+
 					break;
 				}
 				contentNode = parentNode;
@@ -290,39 +318,40 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 		// Insert the list to the DOM tree.
 		var insertAnchor = listContents[ listContents.length - 1 ].getNext(),
-			listNode = doc.createElement( this.type ),
-			dir;
+			listNode = doc.createElement( this.type );
 
 		listsCreated.push( listNode );
+
+		var contentBlock, listItem;
+
 		while ( listContents.length )
 		{
-			var contentBlock = listContents.shift(),
-				listItem = doc.createElement( 'li' );
+			contentBlock = listContents.shift();
+			listItem = doc.createElement( 'li' );
 
 			// Preserve preformat block and heading structure when converting to list item. (#5335) (#5271)
 			if ( contentBlock.is( 'pre' ) || headerTagRegex.test( contentBlock.getName() ) )
 				contentBlock.appendTo( listItem );
 			else
 			{
-				if ( contentBlock.hasAttribute( 'dir' ) )
+				// Remove DIR attribute if it was merged into list root.
+				if ( listDir && contentBlock.getDirection() )
 				{
-					dir = dir || contentBlock.getAttribute( 'dir' );
+					contentBlock.removeStyle( 'direction' );
 					contentBlock.removeAttribute( 'dir' );
 				}
+
 				contentBlock.copyAttributes( listItem );
 				contentBlock.moveChildren( listItem );
 				contentBlock.remove();
-
-				// Append a bogus BR to force the LI to render at full height
-				if ( !CKEDITOR.env.ie )
-					listItem.appendBogus();
 			}
 
 			listItem.appendTo( listNode );
 		}
 
-		if ( dir )
-			listNode.setAttribute( 'dir', dir );
+		// Apply list root dir only if it has been explicitly declared.
+		if ( listDir && explicitDirection )
+			listNode.setAttribute( 'dir', listDir );
 
 		if ( insertAnchor )
 			listNode.insertBefore( insertAnchor );
@@ -443,9 +472,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						enclosedNode = range && range.getEnclosedNode();
 					if ( enclosedNode && enclosedNode.is
 						&& this.type == enclosedNode.getName() )
-					{
-						setState.call( this, editor, CKEDITOR.TRISTATE_ON );
-					}
+							setState.call( this, editor, CKEDITOR.TRISTATE_ON );
 				}
 			}
 
@@ -487,7 +514,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						pathElements = path.elements,
 						pathElementsCount = pathElements.length,
 						listNode = null,
-						processedFlag = false,
+						processedFlag = 0,
 						blockLimit = path.blockLimit,
 						element;
 
@@ -513,7 +540,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								listGroups.push( groupObj );
 								CKEDITOR.dom.element.setMarker( database, element, 'list_group_object', groupObj );
 							}
-							processedFlag = true;
+							processedFlag = 1;
 							break;
 						}
 					}
@@ -566,10 +593,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					{
 						sibling.remove();
 						// Move children order by merge direction.(#3820)
-						sibling.moveChildren( listNode, rtl ? true : false );
+						sibling.moveChildren( listNode, rtl );
 					}
 				} )();
-				mergeSibling( true );
+				mergeSibling( 1 );
 			}
 
 			// Clean up, restore selection and update toolbar button states.

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/listblock/plugin.js

@@ -81,7 +81,7 @@ CKEDITOR.plugins.add( 'listblock',
 					add : function( value, html, title )
 					{
 						var pendingHtml = this._.pendingHtml,
-							id = 'cke_' + CKEDITOR.tools.getNextNumber();
+							id = CKEDITOR.tools.getNextId();
 
 						if ( !this._.started )
 						{
@@ -109,7 +109,7 @@ CKEDITOR.plugins.add( 'listblock',
 					{
 						this._.close();
 
-						var id = 'cke_' + CKEDITOR.tools.getNextNumber();
+						var id = CKEDITOR.tools.getNextId();
 
 						this._.groups[ title ] = id;
 

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/liststyle/dialogs/liststyle.js

@@ -12,7 +12,7 @@
 		catch( e ) { return null; }
 
 		range.shrink( CKEDITOR.SHRINK_TEXT );
-		return range.getCommonAncestor().getAscendant( listTag, true );
+		return range.getCommonAncestor().getAscendant( listTag, 1 );
 	}
 
 	var mapListStyle = {
@@ -28,10 +28,11 @@
 
 	function listStyle( editor, startupPage )
 	{
+		var lang = editor.lang.list;
 		if ( startupPage == 'bulletedListStyle' )
 		{
 			return {
-				title : editor.lang.list.bulletedTitle,
+				title : lang.bulletedTitle,
 				minWidth : 300,
 				minHeight : 50,
 				contents :
@@ -43,15 +44,15 @@
 						[
 							{
 								type : 'select',
-								label : editor.lang.list.type,
+								label : lang.type,
 								id : 'type',
 								style : 'width: 150px; margin: auto;',
 								items :
 								[
-									[ editor.lang.list.notset, '' ],
-									[ editor.lang.list.circle, 'circle' ],
-									[ editor.lang.list.disc,  'disc' ],
-									[ editor.lang.list.square, 'square' ]
+									[ lang.notset, '' ],
+									[ lang.circle, 'circle' ],
+									[ lang.disc,  'disc' ],
+									[ lang.square, 'square' ]
 								],
 								setup : function( element )
 								{
@@ -95,26 +96,26 @@
 
 			var listStyleOptions =
 			[
-				[ editor.lang.list.notset, '' ],
-				[ editor.lang.list.lowerRoman, 'lower-roman' ],
-				[ editor.lang.list.upperRoman, 'upper-roman' ],
-				[ editor.lang.list.lowerAlpha, 'lower-alpha' ],
-				[ editor.lang.list.upperAlpha, 'upper-alpha' ],
-				[ editor.lang.list.decimal, 'decimal' ]
+				[ lang.notset, '' ],
+				[ lang.lowerRoman, 'lower-roman' ],
+				[ lang.upperRoman, 'upper-roman' ],
+				[ lang.lowerAlpha, 'lower-alpha' ],
+				[ lang.upperAlpha, 'upper-alpha' ],
+				[ lang.decimal, 'decimal' ]
 			];
 
 			if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 7 )
 			{
 				listStyleOptions.concat( [
-					[ editor.lang.list.armenian, 'armenian' ],
-					[ editor.lang.list.decimalLeadingZero, 'decimal-leading-zero' ],
-					[ editor.lang.list.georgian, 'georgian' ],
-					[ editor.lang.list.lowerGreek, 'lower-greek' ]
+					[ lang.armenian, 'armenian' ],
+					[ lang.decimalLeadingZero, 'decimal-leading-zero' ],
+					[ lang.georgian, 'georgian' ],
+					[ lang.lowerGreek, 'lower-greek' ]
 				]);
 			}
 
 			return {
-				title : editor.lang.list.numberedTitle,
+				title : lang.numberedTitle,
 				minWidth : 300,
 				minHeight : 50,
 				contents :
@@ -130,10 +131,10 @@
 								children :
 								[
 									{
-										label : editor.lang.list.start,
+										label : lang.start,
 										type : 'text',
 										id : 'start',
-										validate : CKEDITOR.dialog.validate.integer( editor.lang.list.validateStartNumber ),
+										validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),
 										setup : function( element )
 										{
 											var value = element.getAttribute( 'start' ) || 1;
@@ -146,7 +147,7 @@
 									},
 									{
 										type : 'select',
-										label : editor.lang.list.type,
+										label : lang.type,
 										id : 'type',
 										style : 'width: 100%;',
 										items : listStyleOptions,

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/maximize/plugin.js

@@ -10,8 +10,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		if ( !formElement || formElement.type != CKEDITOR.NODE_ELEMENT || formElement.getName() != 'form' )
 			return [];
 
-		var hijackRecord = [];
-		var hijackNames = [ 'style', 'className' ];
+		var hijackRecord = [],
+			hijackNames = [ 'style', 'className' ];
 		for ( var i = 0 ; i < hijackNames.length ; i++ )
 		{
 			var name = hijackNames[i];
@@ -129,12 +129,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		init : function( editor )
 		{
 			var lang = editor.lang;
-			var mainDocument = CKEDITOR.document;
-			var mainWindow = mainDocument.getWindow();
+			var mainDocument = CKEDITOR.document,
+				mainWindow = mainDocument.getWindow();
 
 			// Saved selection and scroll position for the editing area.
-			var savedSelection;
-			var savedScroll;
+			var savedSelection,
+				savedScroll;
 
 			// Saved scroll position for the outer window.
 			var outerScroll;
@@ -194,6 +194,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							container.setCustomData( 'maximize_saved_styles', saveStyles( container, true ) );
 
 							// Hide scroll bars.
+							var viewPaneSize = mainWindow.getViewPaneSize();
+							var styles =
+								{
+									overflow : 'hidden',
+									width : ( CKEDITOR.env.opera ? viewPaneSize.width : 0 ) + 'px',
+									height : ( CKEDITOR.env.opera ? viewPaneSize.height - 16 : 0 ) + 'px'
+								};
+
 							if ( CKEDITOR.env.ie )
 							{
 								mainDocument.$.documentElement.style.overflow =
@@ -201,21 +209,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							}
 							else
 							{
-								mainDocument.getBody().setStyles(
-									{
-										overflow : 'hidden',
-										width : '0px',
-										height : '0px'
-									} );
+								mainDocument.getBody().setStyles( styles );
 							}
 
+							// #4023: [Opera] Maximize plugin
+							if ( CKEDITOR.env.opera )
+								mainDocument.getBody().getParent().setStyles( styles );
+
 							// Scroll to the top left (IE needs some time for it - #4923).
 							CKEDITOR.env.ie ?
 								setTimeout( function() { mainWindow.$.scrollTo( 0, 0 ); }, 0 ) :
 								mainWindow.$.scrollTo( 0, 0 );
 
 							// Resize and move to top left.
-							var viewPaneSize = mainWindow.getViewPaneSize();
 							container.setStyle( 'position', 'absolute' );
 							container.$.offsetLeft;			// SAFARI BUG: See #2066.
 							container.setStyles(
@@ -333,10 +339,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					command : 'maximize'
 				} );
 
-			// Restore the command state after mode change.
+			// Restore the command state after mode change, unless it has been changed to disabled (#6467)
 			editor.on( 'mode', function()
 				{
-					editor.getCommand( 'maximize' ).setState( savedState );
+					var command = editor.getCommand( 'maximize' );
+					command.setState( command.state == CKEDITOR.TRISTATE_DISABLED ? CKEDITOR.TRISTATE_DISABLED : savedState );
 				}, null, null, 100 );
 		}
 	} );

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/menu/plugin.js

@@ -190,15 +190,15 @@ CKEDITOR.plugins.add( 'menu',
 					this._.itemOverFn = CKEDITOR.tools.addFunction( function( index )
 						{
 							clearTimeout( this._.showSubTimeout );
-							this._.showSubTimeout = CKEDITOR.tools.setTimeout( this._.showSubMenu, editor.config.menu_subMenuDelay, this, [ index ] );
+							this._.showSubTimeout = CKEDITOR.tools.setTimeout( this._.showSubMenu, editor.config.menu_subMenuDelay || 400, this, [ index ] );
 						},
-						this);
+						this );
 
 					this._.itemOutFn = CKEDITOR.tools.addFunction( function( index )
 						{
 							clearTimeout( this._.showSubTimeout );
 						},
-						this);
+						this );
 
 					this._.itemClickFn = CKEDITOR.tools.addFunction( function( index )
 						{
@@ -215,14 +215,14 @@ CKEDITOR.plugins.add( 'menu',
 							else
 								this.onClick && this.onClick( item );
 						},
-						this);
+						this );
 				}
 
 				// Put the items in the right order.
 				sortItems( items );
 
-				var chromeRoot = editor.container.getChild( 1 );
-				var mixedContentClass = chromeRoot.hasClass( 'cke_mixed_dir_content' ) ? ' cke_mixed_dir_content' : '';
+				var chromeRoot = editor.container.getChild( 1 ),
+					mixedContentClass = chromeRoot.hasClass( 'cke_mixed_dir_content' ) ? ' cke_mixed_dir_content' : '';
 
 				// Build the HTML that composes the menu and its items.
 				var output = [ '<div class="cke_menu' + mixedContentClass + '" role="presentation">' ];
@@ -390,7 +390,6 @@ CKEDITOR.menuItem = CKEDITOR.tools.createClass(
  * // Remove the submenu delay.
  * config.menu_subMenuDelay = 0;
  */
-CKEDITOR.config.menu_subMenuDelay = 400;
 
 /**
  * A comma separated list of items group names to be displayed in the context

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/newpage/plugin.js

@@ -19,7 +19,7 @@ CKEDITOR.plugins.add( 'newpage',
 				exec : function( editor )
 				{
 					var command = this;
-					editor.setData( editor.config.newpage_html, function()
+					editor.setData( editor.config.newpage_html || '', function()
 					{
 						// Save the undo snapshot after all document changes are affected. (#4889)
 						setTimeout( function ()
@@ -51,4 +51,3 @@ CKEDITOR.plugins.add( 'newpage',
  * @example
  * config.newpage_html = '<p>Type your text here.</p>';
  */
-CKEDITOR.config.newpage_html = '';