radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/find/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
 */
 
@@ -15,6 +15,7 @@ CKEDITOR.plugins.add( 'find',
 			});
 		var findCommand = editor.addCommand( 'find', new CKEDITOR.dialogCommand( 'find' ) );
 		findCommand.canUndo = false;
+		findCommand.readOnly = 1;
 
 		editor.ui.addButton( 'Replace',
 			{

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/flash/dialogs/flash.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
 */
 
@@ -28,7 +28,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		classid : [ { type : ATTRTYPE_OBJECT, name : 'classid' } ],
 		codebase : [ { type : ATTRTYPE_OBJECT, name : 'codebase'} ],
 		pluginspage : [ { type : ATTRTYPE_EMBED, name : 'pluginspage' } ],
-		src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' } ],
+		src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' }, { type : ATTRTYPE_OBJECT, name :  'data' } ],
 		name : [ { type : ATTRTYPE_EMBED, name : 'name' } ],
 		align : [ { type : ATTRTYPE_OBJECT, name : 'align' } ],
 		title : [ { type : ATTRTYPE_OBJECT, name : 'title' }, { type : ATTRTYPE_EMBED, name : 'title' } ],
@@ -175,8 +175,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 		var previewPreloader,
 			previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>' +
-			'<div id="FlashPreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>' +
-			'<div id="FlashPreviewBox"></div></div>';
+			'<div id="cke_FlashPreviewLoader' + CKEDITOR.tools.getNextNumber() + '" style="display:none"><div class="loading">&nbsp;</div></div>' +
+			'<div id="cke_FlashPreviewBox' + CKEDITOR.tools.getNextNumber() + '" class="FlashPreviewBox"></div></div>';
 
 		return {
 			title : editor.lang.flash.title,
@@ -186,11 +186,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			{
 				// Clear previously saved elements.
 				this.fakeImage = this.objectNode = this.embedNode = null;
-				previewPreloader = new CKEDITOR.dom.element( 'embeded', editor.document );
+				previewPreloader = new CKEDITOR.dom.element( 'embed', editor.document );
 
 				// Try to detect any embed or object tag that has Flash parameters.
 				var fakeImage = this.getSelectedElement();
-				if ( fakeImage && fakeImage.getAttribute( '_cke_real_element_type' ) && fakeImage.getAttribute( '_cke_real_element_type' ) == 'flash' )
+				if ( fakeImage && fakeImage.data( 'cke-real-element-type' ) && fakeImage.data( 'cke-real-element-type' ) == 'flash' )
 				{
 					this.fakeImage = fakeImage;
 
@@ -265,12 +265,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						paramMap[ paramList.getItem( i ).getAttribute( 'name' ) ] = paramList.getItem( i );
 				}
 
-				// Apply or remove flash parameters.
-				var extraStyles = {};
-				this.commitContent( objectNode, embedNode, paramMap, extraStyles );
+				// A subset of the specified attributes/styles
+				// should also be applied on the fake element to
+				// have better visual effect. (#5240)
+				var extraStyles = {}, extraAttributes = {};
+				this.commitContent( objectNode, embedNode, paramMap, extraStyles, extraAttributes );
 
 				// Refresh the fake image.
 				var newFakeImage = editor.createFakeElement( objectNode || embedNode, 'cke_flash', 'flash', true );
+				newFakeImage.setAttributes( extraAttributes );
 				newFakeImage.setStyles( extraStyles );
 				if ( this.fakeImage )
 				{
@@ -362,8 +365,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									type : 'text',
 									id : 'width',
 									style : 'width:95px',
-									label : editor.lang.flash.width,
-									validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateWidth ),
+									label : editor.lang.common.width,
+									validate : CKEDITOR.dialog.validate.integer( editor.lang.common.invalidWidth ),
 									setup : function( objectNode, embedNode, paramMap, fakeImage )
 									{
 										loadValue.apply( this, arguments );
@@ -385,8 +388,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									type : 'text',
 									id : 'height',
 									style : 'width:95px',
-									label : editor.lang.flash.height,
-									validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateHeight ),
+									label : editor.lang.common.height,
+									validate : CKEDITOR.dialog.validate.integer( editor.lang.common.invalidHeight ),
 									setup : function( objectNode, embedNode, paramMap, fakeImage )
 									{
 										loadValue.apply( this, arguments );
@@ -555,24 +558,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								{
 									id : 'align',
 									type : 'select',
-									label : editor.lang.flash.align,
+									label : editor.lang.common.align,
 									'default' : '',
 									style : 'width : 100%;',
 									items :
 									[
 										[ editor.lang.common.notSet , ''],
-										[ editor.lang.flash.alignLeft , 'left'],
+										[ editor.lang.common.alignLeft , 'left'],
 										[ editor.lang.flash.alignAbsBottom , 'absBottom'],
 										[ editor.lang.flash.alignAbsMiddle , 'absMiddle'],
 										[ editor.lang.flash.alignBaseline , 'baseline'],
-										[ editor.lang.flash.alignBottom , 'bottom'],
-										[ editor.lang.flash.alignMiddle , 'middle'],
-										[ editor.lang.flash.alignRight , 'right'],
+										[ editor.lang.common.alignBottom , 'bottom'],
+										[ editor.lang.common.alignMiddle , 'middle'],
+										[ editor.lang.common.alignRight , 'right'],
 										[ editor.lang.flash.alignTextTop , 'textTop'],
-										[ editor.lang.flash.alignTop , 'top']
+										[ editor.lang.common.alignTop , 'top']
 									],
 									setup : loadValue,
-									commit : commitValue
+									commit : function( objectNode, embedNode, paramMap, extraStyles, extraAttributes )
+									{
+										var value = this.getValue();
+										commitValue.apply( this, arguments );
+										value && ( extraAttributes.align = value );
+									}
 								},
 								{
 									type : 'html',

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

@@ -1,19 +1,13 @@
 /*
-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
 */
 
 (function()
 {
-	var flashFilenameRegex = /\.swf(?:$|\?)/i,
-		numberRegex = /^\d+(?:\.\d+)?$/;
+	var flashFilenameRegex = /\.swf(?:$|\?)/i;
 
-	function cssifyLength( length )
-	{
-		if ( numberRegex.test( length ) )
-			return length + 'px';
-		return length;
-	}
+	var cssifyLength = CKEDITOR.tools.cssLength;
 
 	function isFlashEmbed( element )
 	{
@@ -77,12 +71,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					});
 			}
 
+			editor.on( 'doubleclick', function( evt )
+				{
+					var element = evt.data.element;
+
+					if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'flash' )
+						evt.data.dialog = 'flash';
+				});
+
 			// If the "contextmenu" plugin is loaded, register the listeners.
 			if ( editor.contextMenu )
 			{
 				editor.contextMenu.addListener( function( element, selection )
 					{
-						if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' )
+						if ( element && element.is( 'img' ) && !element.isReadOnly()
+								&& element.data( 'cke-real-element-type' ) == 'flash' )
 							return { flash : CKEDITOR.TRISTATE_OFF };
 					});
 			}
@@ -104,7 +107,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								var attributes = element.attributes,
 									classId = attributes.classid && String( attributes.classid ).toLowerCase();
 
-								if ( !classId )
+								if ( !classId && !isFlashEmbed( element ) )
 								{
 									// Look for the inner <embed>
 									for ( var i = 0 ; i < element.children.length ; i++ )

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/floatpanel/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
 */
 
@@ -16,14 +16,8 @@ CKEDITOR.plugins.add( 'floatpanel',
 	function getPanel( editor, doc, parentElement, definition, level )
 	{
 		// Generates the panel key: docId-eleId-skinName-langDir[-uiColor][-CSSs][-level]
-		var key =
-			doc.getUniqueId() +
-			'-' + parentElement.getUniqueId() +
-			'-' + editor.skinName +
-			'-' + editor.lang.dir +
-			( ( editor.uiColor && ( '-' + editor.uiColor ) ) || '' ) +
-			( ( definition.css && ( '-' + definition.css ) ) || '' ) +
-			( ( level && ( '-' + level ) ) || '' );
+		var key = CKEDITOR.tools.genKey( doc.getUniqueId(), parentElement.getUniqueId(), editor.skinName, editor.lang.dir,
+			editor.uiColor || '', definition.css || '', level || '' );
 
 		var panel = panels[ key ];
 
@@ -46,7 +40,7 @@ CKEDITOR.plugins.add( 'floatpanel',
 	{
 		$ : function( editor, parentElement, definition, level )
 		{
-			definition.forceIFrame = true;
+			definition.forceIFrame = 1;
 
 			var doc = parentElement.getDocument(),
 				panel = getPanel( editor, doc, parentElement, definition, level || 0 ),
@@ -66,6 +60,8 @@ CKEDITOR.plugins.add( 'floatpanel',
 				children : [],
 				dir : editor.lang.dir
 			};
+
+			editor.on( 'mode', function(){ this.hide(); }, this );
 		},
 
 		proto :
@@ -104,7 +100,7 @@ CKEDITOR.plugins.add( 'floatpanel',
 					block = panel.showBlock( name );
 
 				this.allowBlur( false );
-				isShowing = true;
+				isShowing = 1;
 
 				var element = this.element,
 					iframe = this._.iframe,
@@ -130,13 +126,16 @@ CKEDITOR.plugins.add( 'floatpanel',
 				element.setStyles(
 					{
 						top : top + 'px',
-						left : '-3000px',
-						opacity : '0',	// FF3 is ignoring "visibility"
+						left: 0,
 						display	: ''
 					});
 
+				// Don't use display or visibility style because we need to
+				// calculate the rendering layout later and focus the element.
+				element.setOpacity( 0 );
+
 				// To allow the context menu to decrease back their width
-				element.getFirst().removeStyle('width');
+				element.getFirst().removeStyle( 'width' );
 
 				// Configure the IFrame blur event. Do that only once.
 				if ( !this._.blurSet )
@@ -203,10 +202,10 @@ CKEDITOR.plugins.add( 'floatpanel',
 								// We must adjust first the width or IE6 could include extra lines in the height computation
 								var widthNode = block.element.$;
 
-								if ( CKEDITOR.env.gecko || CKEDITOR.env.opera)
+								if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )
 									widthNode = widthNode.parentNode;
 
-								if ( CKEDITOR.env.ie)
+								if ( CKEDITOR.env.ie )
 									widthNode = widthNode.document.body;
 
 								var width = widthNode.scrollWidth;
@@ -259,13 +258,42 @@ CKEDITOR.plugins.add( 'floatpanel',
 							if ( top + panelSize.height > viewportSize.height + windowScroll.y )
 								top -= panelSize.height;
 
+							// If IE is in RTL, we have troubles with absolute
+							// position and horizontal scrolls. Here we have a
+							// series of hacks to workaround it. (#6146)
+							if ( CKEDITOR.env.ie )
+							{
+								var offsetParent = new CKEDITOR.dom.element( element.$.offsetParent ),
+									scrollParent = offsetParent;
+
+								// Quirks returns <body>, but standards returns <html>.
+								if ( scrollParent.getName() == 'html' )
+									scrollParent = scrollParent.getDocument().getBody();
+
+								if ( scrollParent.getComputedStyle( 'direction' ) == 'rtl' )
+								{
+									// For IE8, there is not much logic on this, but it works.
+									if ( CKEDITOR.env.ie8Compat )
+										left -= element.getDocument().getDocumentElement().$.scrollLeft * 2;
+									else
+										left -= ( offsetParent.$.scrollWidth - offsetParent.$.clientWidth );
+								}
+							}
+
+							// Trigger the onHide event of the previously active panel to prevent
+							// incorrect styles from being applied (#6170)
+							var innerElement = element.getFirst(),
+								activePanel;
+							if ( ( activePanel = innerElement.getCustomData( 'activePanel' ) ) )
+								activePanel.onHide && activePanel.onHide.call( this, 1 );
+							innerElement.setCustomData( 'activePanel', this );
+
 							element.setStyles(
 								{
 									top : top + 'px',
-									left : left + 'px',
-									opacity : '1'
+									left : left + 'px'
 								} );
-
+							element.setOpacity( 1 );
 						} , this );
 
 						panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
@@ -277,13 +305,13 @@ CKEDITOR.plugins.add( 'floatpanel',
 							// We need this get fired manually because of unfired focus() function.
 							this.allowBlur( true );
 						}, 0, this);
-					}, 0, this);
+					},  CKEDITOR.env.air ? 200 : 0, this);
 				this.visible = 1;
 
 				if ( this.onShow )
 					this.onShow.call( this );
 
-				isShowing = false;
+				isShowing = 0;
 			},
 
 			hide : function()
@@ -293,6 +321,7 @@ CKEDITOR.plugins.add( 'floatpanel',
 					this.hideChild();
 					this.element.setStyle( 'display', 'none' );
 					this.visible = 0;
+					this.element.getFirst().removeCustomData( 'activePanel' );
 				}
 			},
 

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/font/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
 */
 
@@ -29,6 +29,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				vars[ styleType ] = values[ i ] = parts[ 1 ] || name;
 
 				styles[ name ] = new CKEDITOR.style( styleDefinition, vars );
+				styles[ name ]._.definition.name = name;
 			}
 			else
 				names.splice( i--, 1 );
@@ -55,7 +56,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						var name = names[ i ];
 
 						// Add the tag entry to the panel list.
-						this.add( name, '<span style="font-' + styleType + ':' + values[ i ] + '">' + name + '</span>', name );
+						this.add( name, styles[ name ].buildPreview(), name );
 					}
 				},
 

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/format/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
 */
 
@@ -21,6 +21,7 @@ CKEDITOR.plugins.add( 'format',
 		{
 			var tag = tags[ i ];
 			styles[ tag ] = new CKEDITOR.style( config[ 'format_' + tag ] );
+			styles[ tag ]._.enterMode = editor.config.enterMode;
 		}
 
 		editor.ui.addRichCombo( 'Format',
@@ -44,7 +45,7 @@ CKEDITOR.plugins.add( 'format',
 						var label = lang[ 'tag_' + tag ];
 
 						// Add the tag entry to the panel list.
-						this.add( tag, '<' + tag + '>' + label + '</' + tag + '>', label );
+						this.add( tag, styles[tag].buildPreview( label ), label );
 					}
 				},
 
@@ -53,7 +54,10 @@ CKEDITOR.plugins.add( 'format',
 					editor.focus();
 					editor.fire( 'saveSnapshot' );
 
-					styles[ value ].apply( editor.document );
+					var style = styles[ value ],
+						elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() );
+
+					style[ style.checkActive( elementPath ) ? 'remove' : 'apply' ]( editor.document );
 
 					// Save the undo snapshot after all changes are affected. (#4899)
 					setTimeout( function()
@@ -107,7 +111,7 @@ CKEDITOR.config.format_tags = 'p;h1;h2;h3;h4;h5;h6;pre;address;div';
  * @type Object
  * @default { element : 'p' }
  * @example
- * config.format_p = { element : 'p', attributes : { class : 'normalPara' } };
+ * config.format_p = { element : 'p', attributes : { 'class' : 'normalPara' } };
  */
 CKEDITOR.config.format_p = { element : 'p' };
 
@@ -116,7 +120,7 @@ CKEDITOR.config.format_p = { element : 'p' };
  * @type Object
  * @default { element : 'div' }
  * @example
- * config.format_div = { element : 'div', attributes : { class : 'normalDiv' } };
+ * config.format_div = { element : 'div', attributes : { 'class' : 'normalDiv' } };
  */
 CKEDITOR.config.format_div = { element : 'div' };
 
@@ -125,7 +129,7 @@ CKEDITOR.config.format_div = { element : 'div' };
  * @type Object
  * @default { element : 'pre' }
  * @example
- * config.format_pre = { element : 'pre', attributes : { class : 'code' } };
+ * config.format_pre = { element : 'pre', attributes : { 'class' : 'code' } };
  */
 CKEDITOR.config.format_pre = { element : 'pre' };
 
@@ -134,7 +138,7 @@ CKEDITOR.config.format_pre = { element : 'pre' };
  * @type Object
  * @default { element : 'address' }
  * @example
- * config.format_address = { element : 'address', attributes : { class : 'styledAddress' } };
+ * config.format_address = { element : 'address', attributes : { 'class' : 'styledAddress' } };
  */
 CKEDITOR.config.format_address = { element : 'address' };
 
@@ -143,7 +147,7 @@ CKEDITOR.config.format_address = { element : 'address' };
  * @type Object
  * @default { element : 'h1' }
  * @example
- * config.format_h1 = { element : 'h1', attributes : { class : 'contentTitle1' } };
+ * config.format_h1 = { element : 'h1', attributes : { 'class' : 'contentTitle1' } };
  */
 CKEDITOR.config.format_h1 = { element : 'h1' };
 
@@ -152,7 +156,7 @@ CKEDITOR.config.format_h1 = { element : 'h1' };
  * @type Object
  * @default { element : 'h2' }
  * @example
- * config.format_h2 = { element : 'h2', attributes : { class : 'contentTitle2' } };
+ * config.format_h2 = { element : 'h2', attributes : { 'class' : 'contentTitle2' } };
  */
 CKEDITOR.config.format_h2 = { element : 'h2' };
 
@@ -161,7 +165,7 @@ CKEDITOR.config.format_h2 = { element : 'h2' };
  * @type Object
  * @default { element : 'h3' }
  * @example
- * config.format_h3 = { element : 'h3', attributes : { class : 'contentTitle3' } };
+ * config.format_h3 = { element : 'h3', attributes : { 'class' : 'contentTitle3' } };
  */
 CKEDITOR.config.format_h3 = { element : 'h3' };
 
@@ -170,7 +174,7 @@ CKEDITOR.config.format_h3 = { element : 'h3' };
  * @type Object
  * @default { element : 'h4' }
  * @example
- * config.format_h4 = { element : 'h4', attributes : { class : 'contentTitle4' } };
+ * config.format_h4 = { element : 'h4', attributes : { 'class' : 'contentTitle4' } };
  */
 CKEDITOR.config.format_h4 = { element : 'h4' };
 
@@ -179,7 +183,7 @@ CKEDITOR.config.format_h4 = { element : 'h4' };
  * @type Object
  * @default { element : 'h5' }
  * @example
- * config.format_h5 = { element : 'h5', attributes : { class : 'contentTitle5' } };
+ * config.format_h5 = { element : 'h5', attributes : { 'class' : 'contentTitle5' } };
  */
 CKEDITOR.config.format_h5 = { element : 'h5' };
 
@@ -188,6 +192,6 @@ CKEDITOR.config.format_h5 = { element : 'h5' };
  * @type Object
  * @default { element : 'h6' }
  * @example
- * config.format_h6 = { element : 'h6', attributes : { class : 'contentTitle6' } };
+ * config.format_h6 = { element : 'h6', attributes : { 'class' : 'contentTitle6' } };
  */
 CKEDITOR.config.format_h6 = { element : 'h6' };