RubyGems - ckeditor - Versions diffs - 3.4.1 → 3.4.2.pre - Mend

@@ -25,9 +25,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	{
 		useComputedState = useComputedState === undefined || useComputedState;
-		var align = useComputedState ?
-			element.getComputedStyle( 'text-align' ) :
-			element.getStyle( 'text-align' ) || element.getAttribute( 'align' ) || '';
+		var align;
+		if ( useComputedState )
+			align = element.getComputedStyle( 'text-align' );
+		else
+		{
+			while ( !element.hasAttribute || !( element.hasAttribute( 'align' ) || element.getStyle( 'text-align' ) ) )
+			{
+				var parent = element.getParent();
+				if ( !parent )
+					break;
+				element = parent;
+			}
+			align = element.getStyle( 'text-align' ) || element.getAttribute( 'align' ) || '';
+		}
 		align && ( align = align.replace( /-moz-|-webkit-|start|auto/i, '' ) );

@@ -758,6 +758,7 @@ CKEDITOR.dialog.add( 'link', function( editor )
 								{
 									if ( data.target )
 										this.setValue( data.target.type );
+									targetChanged.call( this );
 								},
 								commit : function( data )
 								{

@@ -176,10 +176,17 @@ CKEDITOR.plugins.link =
 	 */
 	getSelectedLink : function( editor )
 	{
-		var range;
 		try
 		{
-			range  = editor.getSelection().getRanges( true )[ 0 ];
+			var selection = editor.getSelection();
+			if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
+			{
+				var selectedElement = selection.getSelectedElement();
+				if ( selectedElement.is( 'a' ) )
+					return selectedElement;
+			}
+			var range = selection.getRanges( true )[ 0 ];
 			range.shrink( CKEDITOR.SHRINK_TEXT );
 			var root = range.getCommonAncestor();
 			return root.getAscendant( 'a', true );

@@ -299,8 +299,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			var contentBlock = listContents.shift(),
 				listItem = doc.createElement( 'li' );
-			// Preserve heading structure when converting to list item. (#5271)
-			if ( headerTagRegex.test( contentBlock.getName() ) )
+			// 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
 			{
@@ -312,13 +312,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				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 );
-			// Append a bogus BR to force the LI to render at full height
-			if ( !CKEDITOR.env.ie )
-				listItem.appendBogus();
 		}
 		if ( dir )
@@ -424,7 +424,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					var paragraph = doc.createElement( editor.config.enterMode == CKEDITOR.ENTER_P ? 'p' :
 							( editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'br' ) );
 					paragraph.appendTo( body );
-					ranges = [ new CKEDITOR.dom.range( doc ) ];
+					ranges = new CKEDITOR.dom.rangeList( [ new CKEDITOR.dom.range( doc ) ] );
 					// IE exception on inserting anything when anchor inside <br>.
 					if ( paragraph.is( 'br' ) )
 					{

@@ -221,8 +221,11 @@ CKEDITOR.plugins.add( 'menu',
 				// 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' : '';
 				// Build the HTML that composes the menu and its items.
-				var output = [ '<div class="cke_menu" role="presentation">' ];
+				var output = [ '<div class="cke_menu' + mixedContentClass + '" role="presentation">' ];
 				var length = items.length,
 					lastGroup = length && items[ 0 ].group;

@@ -62,7 +62,13 @@ CKEDITOR.plugins.add( 'pagebreak',
 								childStyle = child && ( child.name == 'span' ) && child.attributes.style;
 							if ( childStyle && ( /page-break-after\s*:\s*always/i ).test( style ) && ( /display\s*:\s*none/i ).test( childStyle ) )
-								return editor.createFakeParserElement( element, 'cke_pagebreak', 'div' );
+							{
+								var fakeImg = editor.createFakeParserElement( element, 'cke_pagebreak', 'div' );
+								var label = editor.lang.pagebreakAlt;
+								fakeImg.attributes[ 'alt' ] = label;
+								fakeImg.attributes[ 'aria-label' ] = label;
+								return fakeImg;
+							}
 						}
 					}
 				});
@@ -77,10 +83,13 @@ CKEDITOR.plugins.pagebreakCmd =
 	exec : function( editor )
 	{
 		// Create the element that represents a print break.
+		var label = editor.lang.pagebreakAlt;
 		var breakObject = CKEDITOR.dom.element.createFromHtml( '<div style="page-break-after: always;"><span style="display: none;">&nbsp;</span></div>' );
 		// Creates the fake image used for this element.
 		breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' );
+		breakObject.setAttribute( 'alt', label );
+		breakObject.setAttribute( 'aria-label', label );
 		var ranges = editor.getSelection().getRanges( true );
@@ -103,7 +112,7 @@ CKEDITOR.plugins.pagebreakCmd =
 			var previous = breakObject.getPrevious();
-			if ( CKEDITOR.dtd[ previous.getName() ].div )
+			if ( previous && CKEDITOR.dtd[ previous.getName() ].div )
 				breakObject.move( previous );
 		}

@@ -3,7 +3,7 @@ Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
-CKEDITOR.plugins.add( 'popup');
+CKEDITOR.plugins.add( 'popup' );
 CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 {
@@ -13,8 +13,9 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 	 * @param {String} url The url of the external file browser.
 	 * @param {String} width Popup window width.
 	 * @param {String} height Popup window height.
+	 * @param {String} options Popup window features.
 	 */
-	popup : function( url, width, height )
+	popup : function( url, width, height, options )
 	{
 		width = width || '80%';
 		height = height || '70%';
@@ -32,8 +33,9 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 			height = 420;
 		var top = parseInt( ( window.screen.height - height ) / 2, 10 ),
-			left = parseInt( ( window.screen.width  - width ) / 2, 10 ),
-			options = 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes' +
+			left = parseInt( ( window.screen.width  - width ) / 2, 10 );
+		options = ( options || 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes' ) +
 			',width='  + width +
 			',height=' + height +
 			',top='  + top +
@@ -57,6 +59,6 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 			popupWindow = window.open( url, null, options, true );
 		}
-		return true ;
+		return true;
 	}
 });

@@ -62,7 +62,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			oParams.onBeforeChange = function()
 			{
 				if ( plugin.getScayt( editor ) && !editor.checkDirty() )
-					setTimeout( function(){ editor.resetDirty(); } );
+					setTimeout( function(){ editor.resetDirty(); }, 0 );
 			};
 			var scayt_custom_params = window.scayt_custom_params;
@@ -496,13 +496,8 @@ CKEDITOR.plugins.scayt =
 					items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos, 10 ) + 1 ? ',' : '' );
 			}
-			// Register scayt rbc menu group.
-			if ( editor.config.scayt_contextMenuOntop )
-				// Put it on top of all context menu items
-				editor.config.menu_groups =  items_order_str + ',' + editor.config.menu_groups;
-			else
-				// Put it down
-				editor.config.menu_groups = editor.config.menu_groups + ',' +items_order_str;
+			// Put it on top of all context menu items (#5717)
+			editor.config.menu_groups =  items_order_str + ',' + editor.config.menu_groups;
 		},
 		init : function( editor )
@@ -930,15 +925,6 @@ CKEDITOR.plugins.scayt =
  * config.scayt_userDictionaryName = 'MyDictionary';
  */
-/**
- * Makes it possible to place the SCAYT context menu items above others.
- * @name CKEDITOR.config.scayt_contextMenuOntop
- * @type Boolean
- * @default false
- * @example
- * config.scayt_contextMenuOntop = true;
- */
 /**
  * Define order of placing of SCAYT context menu items by groups.
  * It must be a string with one or more of the following

@@ -207,16 +207,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							});
 						}
+						var scroll;
 						// IE fires the "selectionchange" event when clicking
 						// inside a selection. We don't want to capture that.
-						body.on( 'mousedown', function ()
+						body.on( 'mousedown', function( evt )
 						{
+							// IE scrolls document to top on right mousedown
+							// when editor has no focus, remember this scroll
+							// position and revert it before context menu opens. (#5778)
+							if ( evt.data.$.button == 2 )
+							{
+								var sel = editor.document.$.selection;
+								if ( sel.type == 'None' )
+									scroll = editor.window.getScrollPosition();
+							}
 							disableSave();
 						});
 						body.on( 'mouseup',
-							function()
+							function( evt )
 							{
+								// Restore recorded scroll position when needed on right mouseup.
+								if ( evt.data.$.button == 2 && scroll )
+								{
+									editor.document.$.documentElement.scrollLeft = scroll.x;
+									editor.document.$.documentElement.scrollTop = scroll.y;
+								}
+								scroll = null;
 								saveEnabled = true;
 								setTimeout( function()
 									{
@@ -673,16 +691,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					// tranform the native ranges in CKEDITOR.dom.range
 					// instances.
-					var ranges = [];
-					var sel = this.getNative();
+					var ranges = [],
+						range,
+						doc = this.document,
+						sel = this.getNative();
 					if ( !sel )
-						return [];
+						return ranges;
+					// On WebKit, it may happen that we'll have no selection
+					// available. We normalize it here by replicating the
+					// behavior of other browsers.
+					if ( !sel.rangeCount )
+					{
+						range = new CKEDITOR.dom.range( doc );
+						range.moveToElementEditStart( doc.getBody() );
+						ranges.push( range );
+					}
 					for ( var i = 0 ; i < sel.rangeCount ; i++ )
 					{
 						var nativeRange = sel.getRangeAt( i );
-						var range = new CKEDITOR.dom.range( this.document );
+						range = new CKEDITOR.dom.range( doc );
 						range.setStart( new CKEDITOR.dom.node( nativeRange.startContainer ), nativeRange.startOffset );
 						range.setEnd( new CKEDITOR.dom.node( nativeRange.endContainer ), nativeRange.endOffset );
@@ -1103,8 +1134,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					// In FF2, if we have a collapsed range, inside an empty
 					// element, we must add something to it otherwise the caret
 					// will not be visible.
+					// In Opera instead, the selection will be moved out of the
+					// element. (#4657)
 					if ( range.collapsed &&
-						( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) &&
+						( CKEDITOR.env.opera || ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ) &&
 						startContainer.type == CKEDITOR.NODE_ELEMENT &&
 						!startContainer.getChildCount() )
 					{

@@ -24,9 +24,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		'.%2 h6'+
 		'{'+
 			'background-repeat: no-repeat;'+
+			'background-position: top %3;'+
 			'border: 1px dotted gray;'+
 			'padding-top: 8px;'+
-			'padding-left: 8px;'+
+			'padding-%3: 8px;'+
 		'}'+
 		'.%2 p'+
@@ -84,7 +85,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			'%1h6.png);'+
 		'}';
-	var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g;
+	var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g, backgroundPositionRegex = /%3/g;
 	var commandDefinition =
 	{
@@ -118,7 +119,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			editor.addCss( cssTemplate
 				.replace( cssTemplateRegex, 'background-image: url(' + CKEDITOR.getUrl( this.path ) + 'images/block_' )
-				.replace( cssClassRegex, 'cke_show_blocks ' ) );
+				.replace( cssClassRegex, 'cke_show_blocks ' )
+				.replace( backgroundPositionRegex, editor.lang.dir == 'rtl' ? 'right' : 'left' ) );
 			editor.ui.addButton( 'ShowBlocks',
 				{

ckeditor 3.4.1 → 3.4.2.pre