radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

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

@@ -1,9 +1,26 @@
 /*
-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
 */
 CKEDITOR.dialog.add( 'button', function( editor )
 {
+	function commitAttributes( element )
+	{
+		var val = this.getValue();
+		if ( val )
+		{
+			element.attributes[ this.id ] = val;
+			if ( this.id == 'name' )
+				element.attributes[ 'data-cke-saved-name' ] = val;
+		}
+		else
+		{
+			delete element.attributes[ this.id ];
+			if ( this.id == 'name' )
+				delete element.attributes[ 'data-cke-saved-name' ];
+		}
+	}
+
 	return {
 		title : editor.lang.button.title,
 		minWidth : 350,
@@ -12,10 +29,10 @@ CKEDITOR.dialog.add( 'button', function( editor )
 		{
 			delete this.button;
 			var element = this.getParentEditor().getSelection().getSelectedElement();
-			if ( element && element.getName() == "input" )
+			if ( element && element.is( 'input' ) )
 			{
 				var type = element.getAttribute( 'type' );
-				if ( type == "button" || type == "reset" || type == "submit" )
+				if ( type in { button:1, reset:1, submit:1 } )
 				{
 					this.button = element;
 					this.setupContent( element );
@@ -24,19 +41,25 @@ CKEDITOR.dialog.add( 'button', function( editor )
 		},
 		onOk : function()
 		{
-			var editor,
+			var editor = this.getParentEditor(),
 				element = this.button,
 				isInsertMode = !element;
 
+			var fake = element ? CKEDITOR.htmlParser.fragment.fromHtml( element.getOuterHtml() ).children[ 0 ]
+					: new CKEDITOR.htmlParser.element( 'input' );
+			this.commitContent( fake );
+
+			var writer = new CKEDITOR.htmlParser.basicWriter();
+			fake.writeHtml( writer );
+			var newElement = CKEDITOR.dom.element.createFromHtml( writer.getHtml(), editor.document );
+
 			if ( isInsertMode )
+				editor.insertElement( newElement );
+			else
 			{
-				editor = this.getParentEditor();
-				element = editor.document.createElement( 'input' );
+				newElement.replace( element );
+				editor.getSelection().selectElement( newElement );
 			}
-
-			if ( isInsertMode )
-				editor.insertElement( element );
-			this.commitContent( { element : element } );
 		},
 		contents : [
 			{
@@ -45,29 +68,18 @@ CKEDITOR.dialog.add( 'button', function( editor )
 				title : editor.lang.button.title,
 				elements : [
 					{
-						id : '_cke_saved_name',
+						id : 'name',
 						type : 'text',
 						label : editor.lang.common.name,
 						'default' : '',
 						setup : function( element )
 						{
 							this.setValue(
-									element.getAttribute( '_cke_saved_name' ) ||
+									element.data( 'cke-saved-name' ) ||
 									element.getAttribute( 'name' ) ||
 									'' );
 						},
-						commit : function( data )
-						{
-							var element = data.element;
-
-							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
-							else
-							{
-								element.removeAttribute( '_cke_saved_name' );
-								element.removeAttribute( 'name' );
-							}
-						}
+						commit : commitAttributes
 					},
 					{
 						id : 'value',
@@ -79,15 +91,7 @@ CKEDITOR.dialog.add( 'button', function( editor )
 						{
 							this.setValue( element.getAttribute( 'value' ) || '' );
 						},
-						commit : function( data )
-						{
-							var element = data.element;
-
-							if ( this.getValue() )
-								element.setAttribute( 'value', this.getValue() );
-							else
-								element.removeAttribute( 'value' );
-						}
+						commit : commitAttributes
 					},
 					{
 						id : 'type',
@@ -105,28 +109,7 @@ CKEDITOR.dialog.add( 'button', function( editor )
 						{
 							this.setValue( element.getAttribute( 'type' ) || '' );
 						},
-						commit : function( data )
-						{
-							var element = data.element;
-
-							if ( CKEDITOR.env.ie )
-							{
-								var elementType = element.getAttribute( 'type' );
-								var currentType = this.getValue();
-
-								if ( currentType != elementType )
-								{
-									var replace = CKEDITOR.dom.element.createFromHtml( '<input type="' + currentType +
-										'"></input>', editor.document );
-									element.copyAttributes( replace, { type : 1 } );
-									replace.replace( element );
-									editor.getSelection().selectElement( replace );
-									data.element = replace;
-								}
-							}
-							else
-								element.setAttribute( 'type', this.getValue() );
-						}
+						commit : commitAttributes
 					}
 				]
 			}

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/forms/dialogs/checkbox.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
 */
 CKEDITOR.dialog.add( 'checkbox', function( editor )
@@ -14,7 +14,7 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 
 			var element = this.getParentEditor().getSelection().getSelectedElement();
 
-			if ( element && element.getAttribute( 'type' ) == "checkbox" )
+			if ( element && element.getAttribute( 'type' ) == 'checkbox' )
 			{
 				this.checkbox = element;
 				this.setupContent( element );
@@ -31,10 +31,8 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 				editor = this.getParentEditor();
 				element = editor.document.createElement( 'input' );
 				element.setAttribute( 'type', 'checkbox' );
-			}
-
-			if ( isInsertMode )
 				editor.insertElement( element );
+			}
 			this.commitContent( { element : element } );
 		},
 		contents : [
@@ -53,7 +51,7 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 						setup : function( element )
 						{
 							this.setValue(
-									element.getAttribute( '_cke_saved_name' ) ||
+									element.data( 'cke-saved-name' ) ||
 									element.getAttribute( 'name' ) ||
 									'' );
 						},
@@ -63,10 +61,10 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 
 							// IE failed to update 'name' property on input elements, protect it now.
 							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
+								element.data( 'cke-saved-name', this.getValue() );
 							else
 							{
-								element.removeAttribute( '_cke_saved_name' );
+								element.data( 'cke-saved-name', false );
 								element.removeAttribute( 'name' );
 							}
 						}
@@ -91,7 +89,19 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 							if ( value && !( CKEDITOR.env.ie && value == 'on' ) )
 								element.setAttribute( 'value', value );
 							else
-								element.removeAttribute( 'value' );
+							{
+								if ( CKEDITOR.env.ie )
+								{
+									// Remove attribute 'value' of checkbox (#4721).
+									var checkbox = new CKEDITOR.dom.element( 'input', element.getDocument() );
+									element.copyAttributes( checkbox, { value: 1 } );
+									checkbox.replace( element );
+									editor.getSelection().selectElement( checkbox );
+									data.element = checkbox;
+								}
+								else
+									element.removeAttribute( 'value' );
+							}
 						}
 					},
 					{
@@ -111,8 +121,8 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 
 							if ( CKEDITOR.env.ie )
 							{
-								var isElementChecked = !!element.getAttribute( 'checked' );
-								var isChecked = !!this.getValue();
+								var isElementChecked = !!element.getAttribute( 'checked' ),
+									isChecked = !!this.getValue();
 
 								if ( isElementChecked != isChecked )
 								{

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/forms/dialogs/form.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
 */
 CKEDITOR.dialog.add( 'form', function( editor )
@@ -39,7 +39,7 @@ CKEDITOR.dialog.add( 'form', function( editor )
 			{
 				editor = this.getParentEditor();
 				element = editor.document.createElement( 'form' );
-				element.append( editor.document.createElement( 'br' ) );
+				!CKEDITOR.env.ie && element.append( editor.document.createElement( 'br' ) );
 			}
 
 			if ( isInsertMode )
@@ -84,17 +84,17 @@ CKEDITOR.dialog.add( 'form', function( editor )
 						accessKey : 'N',
 						setup : function( element )
 						{
-							this.setValue( element.getAttribute( '_cke_saved_name' ) ||
+							this.setValue( element.data( 'cke-saved-name' ) ||
 									element.getAttribute( 'name' ) ||
 									'' );
 						},
 						commit : function( element )
 						{
 							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
+								element.data( 'cke-saved-name', this.getValue() );
 							else
 							{
-								element.removeAttribute( '_cke_saved_name' );
+								element.data( 'cke-saved-name', false );
 								element.removeAttribute( 'name' );
 							}
 						}
@@ -104,7 +104,7 @@ CKEDITOR.dialog.add( 'form', function( editor )
 						type : 'text',
 						label : editor.lang.form.action,
 						'default' : '',
-						accessKey : 'A'
+						accessKey : 'T'
 					},
 					{
 						type : 'hbox',

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

@@ -1,40 +1,50 @@
 /*
-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
 */
 CKEDITOR.dialog.add( 'hiddenfield', function( editor )
 {
 	return {
 		title : editor.lang.hidden.title,
+		hiddenField : null,
 		minWidth : 350,
 		minHeight : 110,
 		onShow : function()
 		{
 			delete this.hiddenField;
 
-			var element = this.getParentEditor().getSelection().getSelectedElement();
-			if ( element && element.getName() == "input" && element.getAttribute( 'type' ) == "checkbox" )
+			var editor = this.getParentEditor(),
+				selection = editor.getSelection(),
+				element = selection.getSelectedElement();
+
+			if ( element && element.data( 'cke-real-element-type' ) && element.data( 'cke-real-element-type' ) == 'hiddenfield' )
 			{
 				this.hiddenField = element;
+				element = editor.restoreRealElement( this.hiddenField );
 				this.setupContent( element );
+				selection.selectElement( this.hiddenField );
 			}
 		},
 		onOk : function()
 		{
-			var editor,
-				element = this.hiddenField,
-				isInsertMode = !element;
+			var name = this.getValueOf( 'info', '_cke_saved_name' ),
+				value = this.getValueOf( 'info', 'value' ),
+				editor = this.getParentEditor(),
+				element = CKEDITOR.env.ie && !( CKEDITOR.document.$.documentMode >= 8 ) ?
+					editor.document.createElement( '<input name="' + CKEDITOR.tools.htmlEncode( name ) + '">' )
+					: editor.document.createElement( 'input' );
 
-			if ( isInsertMode )
+			element.setAttribute( 'type', 'hidden' );
+			this.commitContent( element );
+			var fakeElement = editor.createFakeElement( element, 'cke_hidden', 'hiddenfield' );
+			if ( !this.hiddenField )
+				editor.insertElement( fakeElement );
+			else
 			{
-				editor = this.getParentEditor();
-				element = editor.document.createElement( 'input' );
-				element.setAttribute( 'type', 'hidden' );
+				fakeElement.replace( this.hiddenField );
+				editor.getSelection().selectElement( fakeElement );
 			}
-
-			if ( isInsertMode )
-				editor.insertElement( element );
-			this.commitContent( element );
+			return true;
 		},
 		contents : [
 			{
@@ -51,17 +61,16 @@ CKEDITOR.dialog.add( 'hiddenfield', function( editor )
 						setup : function( element )
 						{
 							this.setValue(
-									element.getAttribute( '_cke_saved_name' ) ||
+									element.data( 'cke-saved-name' ) ||
 									element.getAttribute( 'name' ) ||
 									'' );
 						},
 						commit : function( element )
 						{
 							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
+								element.setAttribute( 'name', this.getValue() );
 							else
 							{
-								element.removeAttribute( '_cke_saved_name' );
 								element.removeAttribute( 'name' );
 							}
 						}

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/forms/dialogs/radio.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
 */
 CKEDITOR.dialog.add( 'radio', function( editor )
@@ -13,7 +13,7 @@ CKEDITOR.dialog.add( 'radio', function( editor )
 			delete this.radioButton;
 
 			var element = this.getParentEditor().getSelection().getSelectedElement();
-			if ( element && element.getName() == "input" && element.getAttribute( 'type' ) == "radio" )
+			if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) == 'radio' )
 			{
 				this.radioButton = element;
 				this.setupContent( element );
@@ -51,7 +51,7 @@ CKEDITOR.dialog.add( 'radio', function( editor )
 						setup : function( element )
 						{
 							this.setValue(
-									element.getAttribute( '_cke_saved_name' ) ||
+									element.data( 'cke-saved-name' ) ||
 									element.getAttribute( 'name' ) ||
 									'' );
 						},
@@ -60,10 +60,10 @@ CKEDITOR.dialog.add( 'radio', function( editor )
 							var element = data.element;
 
 							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
+								element.data( 'cke-saved-name', this.getValue() );
 							else
 							{
-								element.removeAttribute( '_cke_saved_name' );
+								element.data( 'cke-saved-name', false );
 								element.removeAttribute( 'name' );
 							}
 						}
@@ -103,7 +103,7 @@ CKEDITOR.dialog.add( 'radio', function( editor )
 						{
 							var element = data.element;
 
-							if ( !CKEDITOR.env.ie )
+							if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
 							{
 								if ( this.getValue() )
 									element.setAttribute( 'checked', 'checked' );

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/forms/dialogs/select.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
 */
 CKEDITOR.dialog.add( 'select', function( editor )
@@ -161,12 +161,12 @@ CKEDITOR.dialog.add( 'select', function( editor )
 
 			if ( isInsertMode )
 			{
-				editor.insertElement(element);
+				editor.insertElement( element );
 				if ( CKEDITOR.env.ie )
 				{
 					var sel = editor.getSelection(),
 						bms = sel.createBookmarks();
-					setTimeout(function ()
+					setTimeout(function()
 					{
 						sel.selectBookmarks( bms );
 					}, 0 );
@@ -193,11 +193,11 @@ CKEDITOR.dialog.add( 'select', function( editor )
 						setup : function( name, element )
 						{
 							if ( name == 'clear' )
-								this.setValue( '' );
+								this.setValue( this[ 'default' ] || '' );
 							else if ( name == 'select' )
 							{
 								this.setValue(
-										element.getAttribute( '_cke_saved_name' ) ||
+										element.data( 'cke-saved-name' ) ||
 										element.getAttribute( 'name' ) ||
 										'' );
 							}
@@ -205,10 +205,10 @@ CKEDITOR.dialog.add( 'select', function( editor )
 						commit : function( element )
 						{
 							if ( this.getValue() )
-								element.setAttribute( '_cke_saved_name', this.getValue() );
+								element.data( 'cke-saved-name', this.getValue() );
 							else
 							{
-								element.removeAttribute( '_cke_saved_name' ) ;
+								element.data( 'cke-saved-name', false );
 								element.removeAttribute( 'name' );
 							}
 						}
@@ -408,6 +408,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 								[
 									{
 										type : 'button',
+										id : 'btnAdd',
 										style : '',
 										label : editor.lang.select.btnAdd,
 										title : editor.lang.select.btnAdd,
@@ -431,6 +432,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 									},
 									{
 										type : 'button',
+										id : 'btnModify',
 										label : editor.lang.select.btnModify,
 										title : editor.lang.select.btnModify,
 										style : 'width:100%;',
@@ -453,6 +455,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 									},
 									{
 										type : 'button',
+										id : 'btnUp',
 										style : 'width:100%;',
 										label : editor.lang.select.btnUp,
 										title : editor.lang.select.btnUp,
@@ -469,6 +472,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 									},
 									{
 										type : 'button',
+										id : 'btnDown',
 										style : 'width:100%;',
 										label : editor.lang.select.btnDown,
 										title : editor.lang.select.btnDown,
@@ -494,6 +498,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 						[
 							{
 								type : 'button',
+								id : 'btnSetValue',
 								label : editor.lang.select.btnSetValue,
 								title : editor.lang.select.btnSetValue,
 								onClick : function()
@@ -507,6 +512,7 @@ CKEDITOR.dialog.add( 'select', function( editor )
 							},
 							{
 								type : 'button',
+								id : 'btnDelete',
 								label : editor.lang.select.btnDelete,
 								title : editor.lang.select.btnDelete,
 								onClick : function()