radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/listblock/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -9,9 +9,9 @@ CKEDITOR.plugins.add( 'listblock',
 
 	onLoad : function()
 	{
-		CKEDITOR.ui.panel.prototype.addListBlock = function( name, definiton )
+		CKEDITOR.ui.panel.prototype.addListBlock = function( name, definition )
 		{
-			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definiton ) );
+			return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definition ) );
 		};
 
 		CKEDITOR.ui.listBlock = CKEDITOR.tools.createClass(
@@ -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 )
 						{
@@ -93,7 +93,7 @@ CKEDITOR.plugins.add( 'listblock',
 						this._.items[ value ] = id;
 
 						pendingHtml.push(
-							'<li id=', id, ' class=cke_panel_listItem>' +
+							'<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, '\')"' +
@@ -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;
 
@@ -195,11 +195,14 @@ CKEDITOR.plugins.add( 'listblock',
 
 						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 ] );
 					},
 
 					unmarkAll : function()
@@ -211,6 +214,8 @@ CKEDITOR.plugins.add( 'listblock',
 						{
 							doc.getById( items[ value ] ).removeClass( 'cke_selected' );
 						}
+
+						this.onUnmark && this.onUnmark();
 					},
 
 					isMarked : function( value )

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/liststyle/dialogs/liststyle.js

@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+(function()
+{
+	function getListElement( editor, listTag )
+	{
+		var range;
+		try { range  = editor.getSelection().getRanges()[ 0 ]; }
+		catch( e ) { return null; }
+
+		range.shrink( CKEDITOR.SHRINK_TEXT );
+		return range.getCommonAncestor().getAscendant( listTag, 1 );
+	}
+
+	var mapListStyle = {
+		'a' : 'lower-alpha',
+		'A' : 'upper-alpha',
+		'i' : 'lower-roman',
+		'I' : 'upper-roman',
+		'1' : 'decimal',
+		'disc' : 'disc',
+		'circle': 'circle',
+		'square' : 'square'
+	};
+
+	function listStyle( editor, startupPage )
+	{
+		var lang = editor.lang.list;
+		if ( startupPage == 'bulletedListStyle' )
+		{
+			return {
+				title : lang.bulletedTitle,
+				minWidth : 300,
+				minHeight : 50,
+				contents :
+				[
+					{
+						id : 'info',
+						accessKey : 'I',
+						elements :
+						[
+							{
+								type : 'select',
+								label : lang.type,
+								id : 'type',
+								style : 'width: 150px; margin: auto;',
+								items :
+								[
+									[ lang.notset, '' ],
+									[ lang.circle, 'circle' ],
+									[ lang.disc,  'disc' ],
+									[ lang.square, 'square' ]
+								],
+								setup : function( element )
+								{
+									var value = element.getStyle( 'list-style-type' )
+												|| mapListStyle[ element.getAttribute( 'type' ) ]
+												|| element.getAttribute( 'type' )
+												|| '';
+
+									this.setValue( value );
+								},
+								commit : function( element )
+								{
+									var value = this.getValue();
+									if ( value )
+										element.setStyle( 'list-style-type', value );
+									else
+										element.removeStyle( 'list-style-type' );
+								}
+							}
+						]
+					}
+				],
+				onShow: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ul' );
+
+					element && this.setupContent( element );
+				},
+				onOk: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ul' );
+
+					element && this.commitContent( element );
+				}
+			};
+		}
+		else if ( startupPage == 'numberedListStyle'  )
+		{
+
+			var listStyleOptions =
+			[
+				[ 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( [
+					[ lang.armenian, 'armenian' ],
+					[ lang.decimalLeadingZero, 'decimal-leading-zero' ],
+					[ lang.georgian, 'georgian' ],
+					[ lang.lowerGreek, 'lower-greek' ]
+				]);
+			}
+
+			return {
+				title : lang.numberedTitle,
+				minWidth : 300,
+				minHeight : 50,
+				contents :
+				[
+					{
+						id : 'info',
+						accessKey : 'I',
+						elements :
+						[
+							{
+								type : 'hbox',
+								widths : [ '25%', '75%' ],
+								children :
+								[
+									{
+										label : lang.start,
+										type : 'text',
+										id : 'start',
+										validate : CKEDITOR.dialog.validate.integer( lang.validateStartNumber ),
+										setup : function( element )
+										{
+											var value = element.getAttribute( 'start' ) || 1;
+											value && this.setValue( value );
+										},
+										commit : function( element )
+										{
+											element.setAttribute( 'start', this.getValue() );
+										}
+									},
+									{
+										type : 'select',
+										label : lang.type,
+										id : 'type',
+										style : 'width: 100%;',
+										items : listStyleOptions,
+										setup : function( element )
+										{
+											var value = element.getStyle( 'list-style-type' )
+												|| mapListStyle[ element.getAttribute( 'type' ) ]
+												|| element.getAttribute( 'type' )
+												|| '';
+
+											this.setValue( value );
+										},
+										commit : function( element )
+										{
+											var value = this.getValue();
+											if ( value )
+												element.setStyle( 'list-style-type', value );
+											else
+												element.removeStyle( 'list-style-type' );
+										}
+									}
+								]
+							}
+						]
+					}
+				],
+				onShow: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ol' );
+
+					element && this.setupContent( element );
+				},
+				onOk: function()
+				{
+					var editor = this.getParentEditor(),
+						element = getListElement( editor, 'ol' );
+
+					element && this.commitContent( element );
+				}
+			};
+		}
+	}
+
+	CKEDITOR.dialog.add( 'numberedListStyle', function( editor )
+		{
+			return listStyle( editor, 'numberedListStyle' );
+		});
+
+	CKEDITOR.dialog.add( 'bulletedListStyle', function( editor )
+		{
+			return listStyle( editor, 'bulletedListStyle' );
+		});
+})();

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/liststyle/plugin.js

@@ -0,0 +1,66 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+	CKEDITOR.plugins.liststyle =
+	{
+		requires : [ 'dialog' ],
+		init : function( editor )
+		{
+			editor.addCommand( 'numberedListStyle', new CKEDITOR.dialogCommand( 'numberedListStyle' ) );
+			CKEDITOR.dialog.add( 'numberedListStyle', this.path + 'dialogs/liststyle.js' );
+			editor.addCommand( 'bulletedListStyle', new CKEDITOR.dialogCommand( 'bulletedListStyle' ) );
+			CKEDITOR.dialog.add( 'bulletedListStyle', this.path + 'dialogs/liststyle.js' );
+
+			// If the "menu" plugin is loaded, register the menu items.
+			if ( editor.addMenuItems )
+			{
+				//Register map group;
+				editor.addMenuGroup("list", 108);
+
+				editor.addMenuItems(
+					{
+						numberedlist :
+						{
+							label : editor.lang.list.numberedTitle,
+							group : 'list',
+							command: 'numberedListStyle'
+						},
+						bulletedlist :
+						{
+							label : editor.lang.list.bulletedTitle,
+							group : 'list',
+							command: 'bulletedListStyle'
+						}
+					});
+			}
+
+			// If the "contextmenu" plugin is loaded, register the listeners.
+			if ( editor.contextMenu )
+			{
+				editor.contextMenu.addListener( function( element, selection )
+					{
+						if ( !element || element.isReadOnly() )
+							return null;
+
+						while ( element )
+						{
+							var name = element.getName();
+							if ( name == 'ol' )
+								return { numberedlist: CKEDITOR.TRISTATE_OFF };
+							else if ( name == 'ul' )
+								return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+
+							element = element.getParent();
+						}
+						return null;
+					});
+			}
+		}
+	};
+
+	CKEDITOR.plugins.add( 'liststyle', CKEDITOR.plugins.liststyle );
+})();

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/maximize/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -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];
@@ -78,13 +78,50 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		restoreFormStyles( data );
 	}
 
-	function getResizeHandler( mainWindow, editor )
+	function refreshCursor( editor )
 	{
-		return function()
+		// Refresh all editor instances on the page (#5724).
+		var all = CKEDITOR.instances;
+		for ( var i in all )
 		{
-			var viewPaneSize = mainWindow.getViewPaneSize();
-			editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
-		};
+			var one = all[ i ];
+			if ( one.mode == 'wysiwyg' && !one.readOnly )
+			{
+				var body = one.document.getBody();
+				// Refresh 'contentEditable' otherwise
+				// DOM lifting breaks design mode. (#5560)
+				body.setAttribute( 'contentEditable', false );
+				body.setAttribute( 'contentEditable', true );
+			}
+		}
+
+		if ( editor.focusManager.hasFocus )
+		{
+			editor.toolbox.focus();
+			editor.focus();
+		}
+	}
+
+	/**
+	 * Adding an iframe shim to this element, OR removing the existing one if already applied.
+	 * Note: This will only affect IE version below 7.
+	 */
+	 function createIframeShim( element )
+	{
+		if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 6 )
+			return null;
+
+		var shim = CKEDITOR.dom.element.createFromHtml( '<iframe frameborder="0" tabindex="-1"' +
+					' src="javascript:' +
+					   'void((function(){' +
+						   'document.open();' +
+						   ( CKEDITOR.env.isCustomDomain() ? 'document.domain=\'' + this.getDocument().$.domain + '\';' : '' ) +
+						   'document.close();' +
+					   '})())"' +
+					' style="display:block;position:absolute;z-index:-1;' +
+					'progid:DXImageTransform.Microsoft.Alpha(opacity=0);' +
+					'"></iframe>' );
+		return element.append( shim, true );
 	}
 
 	CKEDITOR.plugins.add( 'maximize',
@@ -92,18 +129,25 @@ 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;
 
+			var shim;
+
 			// Saved resize handler function.
-			var resizeHandler = getResizeHandler( mainWindow, editor );
+			function resizeHandler()
+			{
+				var viewPaneSize = mainWindow.getViewPaneSize();
+				shim && shim.setStyles( { width : viewPaneSize.width + 'px', height : viewPaneSize.height + 'px' } );
+				editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
+			}
 
 			// Retain state after mode switches.
 			var savedState = CKEDITOR.TRISTATE_OFF;
@@ -111,6 +155,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			editor.addCommand( 'maximize',
 				{
 					modes : { wysiwyg : 1, source : 1 },
+					readOnly : 1,
 					editorFocus : false,
 					exec : function()
 					{
@@ -150,20 +195,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							container.setCustomData( 'maximize_saved_styles', saveStyles( container, true ) );
 
 							// Hide scroll bars.
-							if ( CKEDITOR.env.ie )
-							{
-								mainDocument.$.documentElement.style.overflow =
-									mainDocument.getBody().$.style.overflow = 'hidden';
-							}
-							else
-							{
-								mainDocument.getBody().setStyles(
-									{
-										overflow : 'hidden',
-										width : '0px',
-										height : '0px'
-									} );
-							}
+							var styles =
+								{
+									overflow : CKEDITOR.env.webkit ? '' : 'hidden',		// #6896
+									width : 0,
+									height : 0
+								};
+
+							mainDocument.getDocumentElement().setStyles( styles );
+							!CKEDITOR.env.gecko && mainDocument.getDocumentElement().setStyle( 'position', 'fixed' );
+							!( CKEDITOR.env.gecko && CKEDITOR.env.quirks ) && mainDocument.getBody().setStyles( styles );
 
 							// Scroll to the top left (IE needs some time for it - #4923).
 							CKEDITOR.env.ie ?
@@ -171,8 +212,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								mainWindow.$.scrollTo( 0, 0 );
 
 							// Resize and move to top left.
-							var viewPaneSize = mainWindow.getViewPaneSize();
-							container.setStyle( 'position', 'absolute' );
+							// Special treatment for FF Quirks (#7284)
+							container.setStyle( 'position', CKEDITOR.env.gecko && CKEDITOR.env.quirks ? 'fixed' : 'absolute' );
 							container.$.offsetLeft;			// SAFARI BUG: See #2066.
 							container.setStyles(
 								{
@@ -180,7 +221,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									left : '0px',
 									top : '0px'
 								} );
-							editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
+
+							shim =  createIframeShim( container );		// IE6 select element penetration when maximized. (#4459)
+
+							// Add cke_maximized class before resize handle since that will change things sizes (#5580)
+							container.addClass( 'cke_maximized' );
+
+							resizeHandler();
 
 							// Still not top left? Fix it. (Bug #174)
 							var offset = container.getDocumentPosition();
@@ -190,8 +237,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									top : ( -1 * offset.y ) + 'px'
 								} );
 
-							// Add cke_maximized class.
-							container.addClass( 'cke_maximized' );
+							// Fixing positioning editor chrome in Firefox break design mode. (#5149)
+							CKEDITOR.env.gecko && refreshCursor( editor );
+
 						}
 						else if ( this.state == CKEDITOR.TRISTATE_ON )	// Restore from fullscreen if the state is on.
 						{
@@ -221,6 +269,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							// Remove cke_maximized class.
 							container.removeClass( 'cke_maximized' );
 
+							// Webkit requires a re-layout on editor chrome. (#6695)
+							if ( CKEDITOR.env.webkit )
+							{
+								container.setStyle( 'display', 'inline' );
+								setTimeout( function(){ container.setStyle( 'display', 'block' ); }, 0 );
+							}
+
+							if ( shim )
+							{
+								shim.remove();
+								shim = null;
+							}
+
 							// Emit a resize event, because this time the size is modified in
 							// restoreStyles.
 							editor.fire( 'resize' );
@@ -230,18 +291,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 						// Toggle button label.
 						var button = this.uiItems[ 0 ];
-						var label = ( this.state == CKEDITOR.TRISTATE_OFF )
-							? lang.maximize : lang.minimize;
-						var buttonNode = editor.element.getDocument().getById( button._.id );
-						buttonNode.getChild( 1 ).setHtml( label );
-						buttonNode.setAttribute( 'title', label );
-						buttonNode.setAttribute( 'href', 'javascript:void("' + label + '");' );
+						// Only try to change the button if it exists (#6166)
+						if( button )
+						{
+							var label = ( this.state == CKEDITOR.TRISTATE_OFF )
+								? lang.maximize : lang.minimize;
+							var buttonNode = editor.element.getDocument().getById( button._.id );
+							buttonNode.getChild( 1 ).setHtml( label );
+							buttonNode.setAttribute( 'title', label );
+							buttonNode.setAttribute( 'href', 'javascript:void("' + label + '");' );
+						}
 
 						// Restore selection and scroll position in editing area.
 						if ( editor.mode == 'wysiwyg' )
 						{
 							if ( savedSelection )
 							{
+								// Fixing positioning editor chrome in Firefox break design mode. (#5149)
+								CKEDITOR.env.gecko && refreshCursor( editor );
+
 								editor.getSelection().selectRanges(savedSelection);
 								var element = editor.getSelection().getStartElement();
 								element && element.scrollIntoView( true );
@@ -273,10 +341,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 );
 		}
 	} );