radiant-ck_editor_filter-extension 0.2.5 → 0.2.6

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/listblock/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
 */
 
@@ -36,7 +36,8 @@ CKEDITOR.plugins.add( 'listblock',
 					keys[ 9 ]	= 'next';					// TAB
 					keys[ 38 ]	= 'prev';					// ARROW-UP
 					keys[ CKEDITOR.SHIFT + 9 ]	= 'prev';	// SHIFT + TAB
-					keys[ 32 ]	= 'click';					// SPACE
+					keys[ 32 ]	= CKEDITOR.env.ie ? 'mouseup' : 'click';					// SPACE
+					CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' );		// Manage ENTER, since onclick is blocked in IE (#8041).
 
 					this._.pendingHtml = [];
 					this._.items = {};
@@ -96,10 +97,10 @@ CKEDITOR.plugins.add( 'listblock',
 							'<li id=', id, ' class=cke_panel_listItem role=presentation>' +
 								'<a id="', id, '_option" _cke_focus=1 hidefocus=true' +
 									' title="', title || value, '"' +
-									' href="javascript:void(\'', value, '\')"' +
-									' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
-									' role="option"' +
-									' aria-posinset="' + ++this._.size + '">',
+									' href="javascript:void(\'', value, '\')" ' +
+									( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) +		// #188
+										'="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
+									' role="option">',
 									html || value,
 								'</a>' +
 							'</li>' );
@@ -120,11 +121,6 @@ CKEDITOR.plugins.add( 'listblock',
 					{
 						this._.close();
 						this.element.appendHtml( this._.pendingHtml.join( '' ) );
-
-						var items = this._.items,
-							doc = this.element.getDocument();
-						for ( var value in items )
-							doc.getById( items[ value ] + '_option' ).setAttribute( 'aria-setsize', this._.size );
 						delete this._.size;
 
 						this._.pendingHtml = [];
@@ -194,15 +190,19 @@ CKEDITOR.plugins.add( 'listblock',
 						item.addClass( 'cke_selected' );
 
 						this.element.getDocument().getById( itemId + '_option' ).setAttribute( 'aria-selected', true );
-						this.element.setAttribute( 'aria-activedescendant', itemId + '_option' );
-
 						this.onMark && this.onMark( item );
 					},
 
 					unmark : function( value )
 					{
-						this.element.getDocument().getById( this._.items[ value ] ).removeClass( 'cke_selected' );
-						this.onUnmark && this.onUnmark( this._.items[ value ] );
+						var doc = this.element.getDocument(),
+							itemId = this._.items[ value ],
+							item = doc.getById( itemId );
+
+						item.removeClass( 'cke_selected' );
+						doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
+
+						this.onUnmark && this.onUnmark( item );
 					},
 
 					unmarkAll : function()
@@ -212,7 +212,10 @@ CKEDITOR.plugins.add( 'listblock',
 
 						for ( var value in items )
 						{
-							doc.getById( items[ value ] ).removeClass( 'cke_selected' );
+							var itemId = items[ value ];
+
+							doc.getById( itemId ).removeClass( 'cke_selected' );
+							doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
 						}
 
 						this.onUnmark && this.onUnmark();

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/liststyle/dialogs/liststyle.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
  */
 
@@ -15,6 +15,8 @@
 		return range.getCommonAncestor().getAscendant( listTag, 1 );
 	}
 
+	var listItem = function( node ) { return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' ); };
+
 	var mapListStyle = {
 		'a' : 'lower-alpha',
 		'A' : 'upper-alpha',
@@ -46,7 +48,8 @@
 								type : 'select',
 								label : lang.type,
 								id : 'type',
-								style : 'width: 150px; margin: auto;',
+								align : 'center',
+								style : 'width:150px',
 								items :
 								[
 									[ lang.notset, '' ],
@@ -137,12 +140,30 @@
 										validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),
 										setup : function( element )
 										{
-											var value = element.getAttribute( 'start' ) || 1;
+											// List item start number dominates.
+											var value = element.getFirst( listItem ).getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
 											value && this.setValue( value );
 										},
 										commit : function( element )
 										{
-											element.setAttribute( 'start', this.getValue() );
+											var firstItem = element.getFirst( listItem );
+											var oldStart = firstItem.getAttribute( 'value' ) || element.getAttribute( 'start' ) || 1;
+
+											// Force start number on list root.
+											element.getFirst( listItem ).removeAttribute( 'value' );
+											var val = parseInt( this.getValue(), 10 );
+											if ( isNaN( val ) )
+												element.removeAttribute( 'start' );
+											else
+												element.setAttribute( 'start', val );
+
+											// Update consequent list item numbering.
+											var nextItem = firstItem, conseq = oldStart, startNumber = isNaN( val ) ? 1 : val;
+											while ( ( nextItem = nextItem.getNext( listItem ) ) && conseq++ )
+											{
+												if ( nextItem.getAttribute( 'value' ) == conseq )
+													nextItem.setAttribute( 'value', startNumber + conseq - oldStart );
+											}
 										}
 									},
 									{

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/liststyle/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/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/maximize/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
 */
 
@@ -154,7 +154,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 			editor.addCommand( 'maximize',
 				{
-					modes : { wysiwyg : 1, source : 1 },
+					// Disabled on iOS (#8307).
+					modes : { wysiwyg : !CKEDITOR.env.iOS, source : !CKEDITOR.env.iOS },
 					readOnly : 1,
 					editorFocus : false,
 					exec : function()

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/menu/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
 */
 
@@ -14,17 +14,36 @@ CKEDITOR.plugins.add( 'menu',
 		for ( var i = 0 ; i < groups.length ; i++ )
 			groupsOrder[ groups[ i ] ] = i + 1;
 
+		/**
+		 * Registers an item group to the editor context menu in order to make it
+		 * possible to associate it with menu items later.
+		 * @name CKEDITOR.editor.prototype.addMenuGroup
+		 * @param {String} name Specify a group name.
+		 * @param {Number} [order=100] Define the display sequence of this group
+		 *  	inside the menu. A smaller value gets displayed first.
+		 */
 		editor.addMenuGroup = function( name, order )
 			{
 				groupsOrder[ name ] = order || 100;
 			};
 
+		/**
+		 * Adds an item from the specified definition to the editor context menu.
+		 * @name CKEDITOR.editor.prototype.addMenuItem
+		 * @param {String} name The menu item name.
+		 * @param {CKEDITOR.menu.definition} definition The menu item definition.
+		 */
 		editor.addMenuItem = function( name, definition )
 			{
 				if ( groupsOrder[ definition.group ] )
 					menuItems[ name ] = new CKEDITOR.menuItem( this, name, definition );
 			};
 
+		/**
+		 * Adds one or more items from the specified definition array to the editor context menu.
+		 * @name CKEDITOR.editor.prototype.addMenuItems
+		 * @param {Array} definitions List of definitions for each menu item as if {@link CKEDITOR.editor.addMenuItem} is called.
+		 */
 		editor.addMenuItems = function( definitions )
 			{
 				for ( var itemName in definitions )
@@ -33,10 +52,27 @@ CKEDITOR.plugins.add( 'menu',
 				}
 			};
 
+		/**
+		 * Retrieves a particular menu item definition from the editor context menu.
+		 * @name CKEDITOR.editor.prototype.getMenuItem
+		 * @param {String} name The name of the desired menu item.
+		 * @return {CKEDITOR.menu.definition}
+		 */
 		editor.getMenuItem = function( name )
 			{
 				return menuItems[ name ];
 			};
+
+		/**
+		 * Removes a particular menu item added before from the editor context menu.
+		 * @name CKEDITOR.editor.prototype.removeMenuItem
+		 * @param {String} name The name of the desired menu item.
+		 * @since 3.6.1
+		 */
+		editor.removeMenuItem = function( name )
+			{
+				delete menuItems[ name ];
+			};
 	},
 
 	requires : [ 'floatpanel' ]
@@ -109,7 +145,7 @@ CKEDITOR.plugins.add( 'menu',
 
 			onClick : function( item )
 			{
-				this.hide();
+				this.hide( false );
 
 				if ( item.onClick )
 					item.onClick();
@@ -132,19 +168,18 @@ CKEDITOR.plugins.add( 'menu',
 					parentBlock._.markItem( parentFocusIndex );
 				}
 				else if ( keystroke == 27 )
-				{
 					this.hide();
-					this.editor.focus();
-				}
+
 				return false;
 			},
 
 			onHide : function()
 			{
-				if ( CKEDITOR.env.ie )
+				// Unlock the selection upon first panel closing.
+				if ( CKEDITOR.env.ie && !this.parent )
 				{
 					var selection = this.editor.getSelection();
-					selection && selection.unlock();
+					selection && selection.unlock( true );
 				}
 
 				this.onHide && this.onHide();
@@ -265,8 +300,9 @@ CKEDITOR.plugins.add( 'menu',
 					keys[ 9 ]	= 'next';					// TAB
 					keys[ 38 ]	= 'prev';					// ARROW-UP
 					keys[ CKEDITOR.SHIFT + 9 ]	= 'prev';	// SHIFT + TAB
-					keys[ 32 ]	= 'click';					// SPACE
-					keys[ ( editor.lang.dir == 'rtl' ? 37 : 39 ) ]	= 'click';  // ARROW-RIGHT/ARROW-LEFT(rtl)
+					keys[ ( editor.lang.dir == 'rtl' ? 37 : 39 ) ]= CKEDITOR.env.ie ? 'mouseup' : 'click';  // ARROW-RIGHT/ARROW-LEFT(rtl)
+					keys[ 32 ]	= CKEDITOR.env.ie ? 'mouseup' : 'click';					// SPACE
+					CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' );		// Manage ENTER, since onclick is blocked in IE (#8041).
 
 					element = this._.element = block.element;
 					element.addClass( editor.skinClass );
@@ -351,10 +387,10 @@ CKEDITOR.plugins.add( 'menu',
 				this._.listeners.push( listenerFn );
 			},
 
-			hide : function()
+			hide : function( returnFocus )
 			{
 				this._.onHide && this._.onHide();
-				this._.panel && this._.panel.hide();
+				this._.panel && this._.panel.hide( returnFocus );
 			}
 		}
 	});
@@ -444,8 +480,9 @@ CKEDITOR.plugins.add( 'menu',
 				output.push(
 //					' onkeydown="return CKEDITOR.ui.button._.keydown(', index, ', event);"' +
 					' onmouseover="CKEDITOR.tools.callFunction(', menu._.itemOverFn, ',', index, ');"' +
-					' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');"' +
-					' onclick="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
+					' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');" ' +
+					( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) +		// #188
+						'="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
 					'>' +
 						'<span class="cke_icon_wrapper"><span class="cke_icon"' +
 							( this.icon ? ' style="background-image:url(' + CKEDITOR.getUrl( this.icon ) + ');background-position:0 ' + offset + 'px;"'
@@ -478,8 +515,8 @@ CKEDITOR.plugins.add( 'menu',
 
 
 /**
- * The amount of time, in milliseconds, the editor waits before showing submenu
- * options when moving the mouse over options that contains submenus, like the
+ * The amount of time, in milliseconds, the editor waits before displaying submenu
+ * options when moving the mouse over options that contain submenus, like the
  * "Cell Properties" entry for tables.
  * @type Number
  * @default 400
@@ -490,8 +527,8 @@ CKEDITOR.plugins.add( 'menu',
 
 /**
  * A comma separated list of items group names to be displayed in the context
- * menu. The items order will reflect the order in this list if no priority
- * has been definted in the groups.
+ * menu. The order of items will reflect the order specified in this list if
+ * no priority was defined in the groups.
  * @type String
  * @default 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea'
  * @example

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/menubutton/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/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/newpage/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
 */
 
@@ -47,6 +47,7 @@ CKEDITOR.plugins.add( 'newpage',
 });
 /**
  * The HTML to load in the editor when the "new page" command is executed.
+ * @name CKEDITOR.config.newpage_html
  * @type String
  * @default ''
  * @example

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/pagebreak/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
 */
 
@@ -130,7 +130,7 @@ CKEDITOR.plugins.pagebreakCmd =
 			'aria-label="'+ label + '" ' +
 			'data-cke-display-name="pagebreak" ' +
 			'class="cke_pagebreak">' +
-			'</div>' );
+			'</div>', editor.document );
 
 		var ranges = editor.getSelection().getRanges( true );
 

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/panel/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
 */
 
@@ -137,6 +137,13 @@ CKEDITOR.ui.panel.prototype =
 					langCode = parentDiv.getParent().getAttribute( 'lang' ),
 					doc = iframe.getFrameDocument();
 
+				// Make it scrollable on iOS. (#8308)
+				CKEDITOR.env.iOS && parentDiv.setStyles(
+					{
+						'overflow' : 'scroll',
+						'-webkit-overflow-scrolling' : 'touch'
+					});
+
 				var onLoad = CKEDITOR.tools.addFunction( CKEDITOR.tools.bind( function( ev )
 					{
 						this.isLoaded = true;
@@ -149,13 +156,10 @@ CKEDITOR.ui.panel.prototype =
 					'<html dir="' + dir + '" class="' + className + '_container" lang="' + langCode + '">' +
 						'<head>' +
 							'<style>.' + className + '_container{visibility:hidden}</style>' +
+							CKEDITOR.tools.buildStyleHtml( this.css ) +
 						'</head>' +
 						'<body class="cke_' + dir + ' cke_panel_frame ' + CKEDITOR.env.cssClass + '" style="margin:0;padding:0"' +
 						' onload="( window.CKEDITOR || window.parent.CKEDITOR ).tools.callFunction(' + onLoad + ');"></body>' +
-						// It looks strange, but for FF2, the styles must go
-						// after <body>, so it (body) becames immediatelly
-						// available. (#3031)
-						CKEDITOR.tools.buildStyleHtml( this.css ) +
 					'<\/html>';
 
 				doc.write( data );
@@ -220,13 +224,12 @@ CKEDITOR.ui.panel.prototype =
 	{
 		var blocks = this._.blocks,
 			block = blocks[ name ],
-			current = this._.currentBlock,
-			holder = this.forceIFrame ?
-				this.document.getById( this.id + '_frame' )
-				: this._.holder;
+			current = this._.currentBlock;
 
-		// Disable context menu for block panel.
-		holder.getParent().getParent().disableContextMenu();
+		// ARIA role works better in IE on the body element, while on the iframe
+		// for FF. (#8864)
+		var holder = !this.forceIFrame || CKEDITOR.env.ie ?
+				 this._.holder : this.document.getById( this.id + '_frame' );
 
 		if ( current )
 		{
@@ -245,16 +248,6 @@ CKEDITOR.ui.panel.prototype =
 
 		this._.onKeyDown = block.onKeyDown && CKEDITOR.tools.bind( block.onKeyDown, block );
 
-		block.onMark = function( item )
-		{
-			holder.setAttribute( 'aria-activedescendant', item.getId() + '_option' );
-		};
-
-		block.onUnmark = function()
-		{
-			holder.removeAttribute( 'aria-activedescendant' );
-		};
-
 		block.show();
 
 		return block;
@@ -380,11 +373,12 @@ CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
 					return false;
 
 				case 'click' :
+				case 'mouseup' :
 					index = this._.focusIndex;
 					link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
 
 					if ( link )
-						link.$.click ? link.$.click() : link.$.onclick();
+						link.$[ keyAction ] ? link.$[ keyAction ]() : link.$[ 'on' + keyAction ]();
 
 					return false;
 			}