ckeditor 3.4.2 → 3.4.3.pre

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

@@ -153,4 +153,3 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example
  * config.startupOutlineBlocks = true;
  */
-CKEDITOR.config.startupOutlineBlocks = false;

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

@@ -36,7 +36,9 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 					src : src,
 					_cke_saved_src : src,
 					title : title,
-					alt : title
+					alt : title,
+					width : target.$.width,
+					height : target.$.height
 				}
 			});
 
@@ -52,8 +54,8 @@ CKEDITOR.dialog.add( 'smiley', function( editor )
 		element = new CKEDITOR.dom.element( element );
 		var relative, nodeToMove;
 
-		var keystroke = ev.getKeystroke();
-		var rtl = editor.lang.dir == 'rtl';
+		var keystroke = ev.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
 		switch ( keystroke )
 		{
 			// UP-ARROW

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

@@ -72,12 +72,12 @@ CKEDITOR.plugins.add( 'sourcearea',
 								win.on( 'resize', onResize );
 								setTimeout( onResize, 0 );
 							}
-							else
+							// As we prevent click to put focus on editor container,
+							// while 'mousedown' inside <textarea> is also captured,
+							// but we must stop the even propagation, otherwise
+							// it's not possible to place the caret inside of it (non IE and IE9).
+							if ( document.addEventListener )
 							{
-								// By some yet unknown reason, we must stop the
-								// mousedown propagation for the textarea,
-								// otherwise it's not possible to place the caret
-								// inside of it (non IE).
 								textarea.on( 'mousedown', function( evt )
 									{
 										evt.data.stopPropagation();

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

@@ -112,8 +112,8 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
 		// Get an Anchor element.
 		var element = ev.getTarget();
 		var relative, nodeToMove;
-		var keystroke = ev.getKeystroke();
-		var rtl = editor.lang.dir == 'rtl';
+		var keystroke = ev.getKeystroke(),
+			rtl = editor.lang.dir == 'rtl';
 
 		switch ( keystroke )
 		{
@@ -347,7 +347,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
 								focus : function()
 								{
 									var firstChar = this.getElement().getElementsByTag( 'a' ).getItem( 0 );
-									setTimeout(function()
+									setTimeout( function()
 									{
 										firstChar.focus();
 										onFocus( null, firstChar );

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

@@ -478,39 +478,64 @@ CKEDITOR.STYLE_OBJECT = 3;
 			if ( applyStyle && styleRange && !styleRange.collapsed )
 			{
 				// Build the style element, based on the style object definition.
-				var styleNode = getElement( this, document );
+				var styleNode = getElement( this, document ),
+					styleHasAttrs = styleNode.hasAttributes();
 
 				// Get the element that holds the entire range.
 				var parent = styleRange.getCommonAncestor();
 
+				var removeList = {
+					styles : {},
+					attrs : {},
+					// Styles cannot be removed.
+					blockedStyles : {},
+					// Attrs cannot be removed.
+					blockedAttrs : {}
+				};
+
+				var attName, styleName, value;
+
 				// Loop through the parents, removing the redundant attributes
 				// from the element to be applied.
 				while ( styleNode && parent )
 				{
 					if ( parent.getName() == elementName )
 					{
-						for ( var attName in def.attributes )
+						for ( attName in def.attributes )
 						{
-							if ( styleNode.getAttribute( attName ) == parent.getAttribute( attName ) )
-								styleNode.removeAttribute( attName );
-						}
+							if ( removeList.blockedAttrs[ attName ] || !( value = parent.getAttribute( styleName ) ) )
+								continue;
 
-						for ( var styleName in def.styles )
-						{
-							if ( styleNode.getStyle( styleName ) == parent.getStyle( styleName ) )
-								styleNode.removeStyle( styleName );
+							if ( styleNode.getAttribute( attName ) == value )
+								removeList.attrs[ attName ] = 1;
+							else
+								removeList.blockedAttrs[ attName ] = 1;
 						}
 
-						if ( !styleNode.hasAttributes() )
+						for ( styleName in def.styles )
 						{
-							styleNode = null;
-							break;
+							if ( removeList.blockedStyles[ styleName ] || !( value = parent.getStyle( styleName ) ) )
+								continue;
+
+							if ( styleNode.getStyle( styleName ) == value )
+								removeList.styles[ styleName ] = 1;
+							else
+								removeList.blockedStyles[ styleName ] = 1;
 						}
 					}
 
 					parent = parent.getParent();
 				}
 
+				for ( attName in removeList.attrs )
+					styleNode.removeAttribute( attName );
+
+				for ( styleName in removeList.styles )
+					styleNode.removeStyle( styleName );
+
+				if ( styleHasAttrs && !styleNode.hasAttributes() )
+					styleNode = null;
+
 				if ( styleNode )
 				{
 					// Move the contents of the range to the style element.
@@ -536,6 +561,15 @@ CKEDITOR.STYLE_OBJECT = 3;
 					if ( !CKEDITOR.env.ie )
 						styleNode.$.normalize();
 				}
+				// Style already inherit from parents, left just to clear up any internal overrides. (#5931)
+				else
+				{
+					styleNode = new CKEDITOR.dom.element( 'span' );
+					styleRange.extractContents().appendTo( styleNode );
+					styleRange.insertNode( styleNode );
+					removeFromInsideElement( this, styleNode );
+					styleNode.remove( true );
+				}
 
 				// Style applied, let's release the range, so it gets
 				// re-initialization in the next loop.
@@ -775,7 +809,7 @@ CKEDITOR.STYLE_OBJECT = 3;
 
 		while ( ( block = iterator.getNextParagraph() ) )		// Only one =
 		{
-			var newBlock = getElement( this, doc );
+			var newBlock = getElement( this, doc, block );
 			replaceBlock( block, newBlock );
 		}
 
@@ -1083,7 +1117,7 @@ CKEDITOR.STYLE_OBJECT = 3;
 		}
 	}
 
-	function getElement( style, targetDocument )
+	function getElement( style, targetDocument, element )
 	{
 		var el;
 
@@ -1098,6 +1132,10 @@ CKEDITOR.STYLE_OBJECT = 3;
 		// Create the element.
 		el = new CKEDITOR.dom.element( elementName, targetDocument );
 
+		// #6226: attributes should be copied before the new ones are applied
+		if ( element )
+			element.copyAttributes( el );
+
 		return setupElement( el, style );
 	}
 
@@ -1117,16 +1155,8 @@ CKEDITOR.STYLE_OBJECT = 3;
 		}
 
 		// Assign all defined styles.
-		if ( def.styles )
-		{
-			for ( var i in def.styles )
-			{
-				if ( !def.styles.hasOwnProperty( i ) )
-					continue;
-
-				el.setStyle( i, def.styles[ i ] );
-			}
-		}
+		if( styles )
+			el.setAttribute( 'style', styles );
 
 		return el;
 	}
@@ -1276,7 +1306,11 @@ CKEDITOR.STYLE_OBJECT = 3;
 		// Compensate tail semi-colon.
 		return styleText.replace( /\s*([;:])\s*/, '$1' )
 							 .replace( /([^\s;])$/, '$1;')
-							 .replace( /,\s+/g, ',' ) // Trimming spaces after comma (e.g. font-family name)(#4107).
+				 			// Trimming spaces after comma(#4107),
+				 			// remove quotations(#6403),
+				 			// mostly for differences on "font-family".
+							 .replace( /,\s+/g, ',' )
+							 .replace( /\"/g,'' )
 							 .toLowerCase();
 	}
 
@@ -1320,8 +1354,8 @@ CKEDITOR.STYLE_OBJECT = 3;
 	{
 		var selection = document.getSelection(),
 			// Bookmark the range so we can re-select it after processing.
-			bookmarks = selection.createBookmarks(),
-			ranges = selection.getRanges( true ),
+			bookmarks = selection.createBookmarks( 1 ),
+			ranges = selection.getRanges( 1 ),
 			func = remove ? this.removeFromRange : this.applyToRange,
 			range;
 
@@ -1332,7 +1366,7 @@ CKEDITOR.STYLE_OBJECT = 3;
 		if ( bookmarks.length == 1 && bookmarks[0].collapsed )
 		{
 			selection.selectRanges( ranges );
-			bookmarks[0].startNode.remove();
+			document.getById( bookmarks[ 0 ].startNode ).remove();
 		}
 		else
 			selection.selectBookmarks( bookmarks );

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

@@ -26,7 +26,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							styleName;
 
 						// Put all styles into an Array.
-						for ( var i = 0 ; i < stylesDefinitions.length ; i++ )
+						for ( var i = 0, count = stylesDefinitions.length ; i < count ; i++ )
 						{
 							var styleDefinition = stylesDefinitions[ i ];
 
@@ -71,7 +71,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								// Loop over the Array, adding all items to the
 								// combo.
 								var lastType;
-								for ( var i = 0 ; i < stylesList.length ; i++ )
+								for ( var i = 0, count = stylesList.length ; i < count ; i++ )
 								{
 									style = stylesList[ i ];
 									styleName = style._name;
@@ -126,7 +126,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									elements = elementPath.elements;
 
 								// For each element into the elements path.
-								for ( var i = 0, element ; i < elements.length ; i++ )
+								for ( var i = 0, count = elements.length, element ; i < count ; i++ )
 								{
 									element = elements[i];
 
@@ -154,9 +154,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						if ( CKEDITOR.env.ie || CKEDITOR.env.webkit )
 							editor.focus();
 
-						var selection = editor.getSelection();
-
-						var element = selection.getSelectedElement(),
+						var selection = editor.getSelection(),
+							element = selection.getSelectedElement(),
 							elementPath = new CKEDITOR.dom.elementPath( element || selection.getStartElement() );
 
 						var counter = [ 0, 0, 0, 0 ];

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

@@ -38,8 +38,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				if ( editor.focusManager.hasFocus )
 				{
 					var sel = editor.getSelection(),
-							ancestor = sel.getCommonAncestor(),
-							cell;
+						ancestor = sel.getCommonAncestor(),
+						cell;
 
 					if ( ( cell = ( ancestor.getAscendant( 'td', true ) || ancestor.getAscendant( 'th', true ) ) ) )
 					{

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

@@ -604,8 +604,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 										if ( nodeList.count() > 0 )
 										{
 											var caption = nodeList.getItem( 0 );
-											caption = ( caption.getChild( 0 ) && caption.getChild( 0 ).getText() ) || '';
-											caption = CKEDITOR.tools.trim( caption );
+											caption = CKEDITOR.tools.trim( caption.getText() );
 											this.setValue( caption );
 										}
 									},

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

@@ -58,10 +58,10 @@ CKEDITOR.plugins.add( 'table',
 		{
 			editor.contextMenu.addListener( function( element, selection )
 				{
-					if ( !element || element.isReadOnly())
+					if ( !element || element.isReadOnly() )
 						return null;
 
-					var isTable	= element.is( 'table' ) || element.hasAscendant( 'table' );
+					var isTable = element.hasAscendant( 'table', 1 );
 
 					if ( isTable )
 					{

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

@@ -393,7 +393,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				return;
 		}
 
-		target.getAscendant( 'table', true ).removeCustomData( '_cke_table_pillars' );
+		target.getAscendant( 'table', 1 ).removeCustomData( '_cke_table_pillars' );
 		evt.removeListener();
 	}
 
@@ -423,10 +423,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							table,
 							pillars;
 
-						if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', true ) )
+						if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', 1 ) )
 							return;
 
-						table = target.getAscendant( 'table', true );
+						table = target.getAscendant( 'table', 1 );
 
 						if ( !( pillars = table.getCustomData( '_cke_table_pillars' ) ) )
 						{

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

@@ -146,7 +146,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			return;
 
 		// Create a clone of the row.
-		var newRow = row.clone( true );
+		var newRow = row.clone( 1 );
 
 		insertBefore ?
 			newRow.insertBefore( row ) :
@@ -216,7 +216,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	{
 		// Get the cell where the selection is placed in.
 		var startElement = selection.getStartElement();
-		var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true );
+		var cell = startElement.getAscendant( 'td', 1 ) || startElement.getAscendant( 'th', 1 );
 
 		if ( !cell )
 			return;
@@ -234,7 +234,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			if ( $row.cells.length < ( cellIndex + 1 ) )
 				continue;
 
-			cell = ( new CKEDITOR.dom.element( $row.cells[ cellIndex ] ) ).clone( false );
+			cell = ( new CKEDITOR.dom.element( $row.cells[ cellIndex ] ) ).clone( 0 );
 
 			if ( !CKEDITOR.env.ie )
 				cell.appendBogus();
@@ -339,7 +339,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	function insertCell( selection, insertBefore )
 	{
 		var startElement = selection.getStartElement();
-		var cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true );
+		var cell = startElement.getAscendant( 'td', 1 ) || startElement.getAscendant( 'th', 1 );
 
 		if ( !cell )
 			return;
@@ -714,9 +714,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				{
 					exec : function( editor )
 					{
-						var selection = editor.getSelection();
-						var startElement = selection && selection.getStartElement();
-						var table = startElement && startElement.getAscendant( 'table', true );
+						var selection = editor.getSelection(),
+							startElement = selection && selection.getStartElement(),
+							table = startElement && startElement.getAscendant( 'table', 1 );
 
 						if ( !table )
 							return;
@@ -727,9 +727,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						range.collapse();
 						selection.selectRanges( [ range ] );
 
-						// If the table's parent has only one child, remove it,except body,as well.( #5416 )
+						// If the table's parent has only one child remove it as well (unless it's the body or a table cell) (#5416, #6289)
 						var parent = table.getParent();
-						if ( parent.getChildCount() == 1 && parent.getName() != 'body' )
+						if ( parent.getChildCount() == 1 && !parent.is( 'body', 'td', 'th' ) )
 							parent.remove();
 						else
 							table.remove();