Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/button.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -56,11 +56,8 @@
 		minWidth : 400,
 		minHeight : 230,
-		onOk: function( data )
+		onOk : function( data )
 		{
-			for ( var name in this.changedAttibutes )
-			{
-				this.editObj.setAttribute( name, this.changedAttibutes[ name ] );
-			}
-
+			this.editObj.setAttributes( this.changedAttibutes );
+			
 			if ( this.editMode == false )
 			{			
@@ -72,5 +69,5 @@
 			return true;
 		},
-		onShow: function()
+		onShow : function()
 		{
 			// Default: create a new element.
@@ -99,5 +96,4 @@
 						selection.selectElement( element );
 					}
-
 				}
 			}
@@ -123,5 +119,5 @@
 						label : editor.lang.dlgCheckboxName,
 						'default' : '',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -134,5 +130,5 @@
 						label : editor.lang.dlgButtonText,
 						accessKey : 'V',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'value', this );
@@ -152,5 +148,5 @@
 							[ editor.lang.dlgButtonTypeRst, 'reset' ]
 						],
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'type', this );
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/checkbox.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -36,14 +36,12 @@
 		minWidth : 400,
 		minHeight : 230,
-		onOk: function( data )
+		onOk : function()
 		{
 			this.changedAttibutes[ 'type' ] = 'checkbox';
 
-			for( var name in this.changedAttibutes )
-			{
-				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
-			}
+			for ( var name in this.changedAttibutes )
+				this.editObj.setAttribute( name, this.changedAttibutes[ name ] );
 
-			if( this.editMode == false )
+			if ( this.editMode == false )
 			{
 				this.restoreSelection();
@@ -52,8 +50,5 @@
 			return true;
 		},
-		onCancel: function()
-		{
-		},
-		onShow: function()
+		onShow : function()
 		{
 			this.editMode = false;
@@ -64,8 +59,6 @@
 			*/
 
-			if( this.editMode == false )	//New object.
-			{
+			if ( this.editMode == false )	//New object.
 				this.editObj = editor.document.createElement( 'input' );
-			}
 
 			this.getContentElement( 'info', 'txtName' ).focus();
@@ -85,5 +78,5 @@
 						'default' : '',
 						accessKey : 'N',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -97,5 +90,5 @@
 						'default' : '',
 						accessKey : 'V',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'value', this );
@@ -109,5 +102,5 @@
 						'default' : 'url',
 						accessKey : 'S',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'selected', this );
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -36,12 +36,10 @@
 		minWidth : 400,
 		minHeight : 230,
-		onOk: function( data )
+		onOk : function( data )
 		{
-			for( var name in this.changedAttibutes )
-			{
+			for ( var name in this.changedAttibutes )
 				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
-			}
 
-			if( this.editMode == false )	//New object.
+			if ( this.editMode == false )	//New object.
 			{
 				this.restoreSelection();
@@ -50,5 +48,5 @@
 			return true;
 		},
-		onShow: function()
+		onShow : function()
 		{
 
@@ -61,7 +59,5 @@
 
 			if( this.editMode == false )
-			{
 				this.editObj = editor.document.createElement( 'form' );
-			}
 
 			this.getContentElement( 'info', 'txtName' ).focus();
@@ -81,5 +77,5 @@
 						'default' : '',
 						accessKey : 'N',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -93,5 +89,5 @@
 						'default' : '',
 						accessKey : 'A',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'action', this );
@@ -110,5 +106,5 @@
 							[ 'POST', 'post' ]
 						],
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'method', this );
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/hiddenfield.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -36,11 +36,9 @@
 		minWidth : 400,
 		minHeight : 200,
-		onOk: function( data )
+		onOk : function()
 		{
 			this.changedAttibutes[ 'type' ] = 'hidden';
-			for( var name in this.changedAttibutes )
-			{
+			for ( var name in this.changedAttibutes )
 				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
-			}
 
 			if( this.editMode == false )
@@ -51,8 +49,5 @@
 			return true;
 		},
-		onCancel: function()
-		{
-		},
-		onShow: function()
+		onShow : function()
 		{
 			this.editMode = false;
@@ -64,7 +59,5 @@
 
 			if( this.editMode == false )	//New object.
-			{
 				this.editObj = editor.document.createElement( 'input' );
-			}
 
 			this.getContentElement( 'info', 'txtName' ).focus();
@@ -84,5 +77,5 @@
 						'default' : '',
 						accessKey : 'N',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -96,5 +89,5 @@
 						'default' : '',
 						accessKey : 'V',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'value', this );
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/radio.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -36,12 +36,10 @@
 		minWidth : 400,
 		minHeight : 200,
-		onOk: function( data )
+		onOk : function()
 		{
 			this.changedAttibutes[ 'type' ] = 'radio';
 
-			for( var name in this.changedAttibutes )
-			{
+			for ( var name in this.changedAttibutes )
 				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
-			}
 
 			if( this.editMode == false )
@@ -52,8 +50,5 @@
 			return true;
 		},
-		onCancel: function()
-		{
-		},
-		onShow: function()
+		onShow : function()
 		{
 			this.editMode = false;
@@ -65,7 +60,5 @@
 
 			if( this.editMode == false )	//New object.
-			{
 				this.editObj = editor.document.createElement( 'input' );
-			}
 
 			this.getContentElement( 'info', 'txtName' ).focus();
@@ -85,5 +78,5 @@
 						'default' : '',
 						accessKey : 'N',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -97,5 +90,5 @@
 						'default' : '',
 						accessKey : 'V',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'value', this );
@@ -109,5 +102,5 @@
 						'default' : 'url',
 						accessKey : 'S',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'selected', this );
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/select.js	(revision 2774)
@@ -36,5 +36,5 @@
 		minWidth : 400,
 		minHeight : 350,
-		onShow: function()
+		onShow : function()
 		{
 			var parentEditor = this.getParentEditor();
@@ -84,5 +84,5 @@
 			this.changedAttibutes = new Array();
 		},
-		onOk: function()
+		onOk : function()
 		{
 
@@ -124,7 +124,4 @@
 			}
 			return true;
-		},
-		onCancel: function()
-		{
 		},
 		contents : [
@@ -145,5 +142,5 @@
 						align:'center',
 						style : 'width:350px',
-						validate: function( data )
+						validate: function()
 						{
 							addChange( 'name', this );
@@ -177,5 +174,5 @@
 								accessKey : 'S',
 								style : 'width:175px',
-								validate: function( data )
+								validate: function()
 								{
 									if ( this.getValue() != '' )
@@ -403,5 +400,5 @@
 								'default' : 'url',
 								accessKey : 'M',
-								validate: function( data )
+								validate: function()
 								{
 									// Multiselect checkbox.
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textarea.js	(revision 2774)
@@ -36,12 +36,10 @@
 		minWidth : 400,
 		minHeight : 230,
-		onOk: function( data )
+		onOk : function( data )
 		{
-			for( var name in this.changedAttibutes )
-			{
+			for ( var name in this.changedAttibutes )
 				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
-			}
 
-			if( this.editMode == false )
+			if ( this.editMode == false )
 			{
 				this.restoreSelection();
@@ -50,5 +48,5 @@
 			return true;
 		},
-		onShow: function()
+		onShow : function()
 		{
 			this.editMode = false;
@@ -59,8 +57,6 @@
 			*/
 
-			if( this.editMode == false )	//New object.
-			{
+			if ( this.editMode == false )	//New object.
 				this.editObj = editor.document.createElement( 'textarea' );
-			}
 
 			this.getContentElement( 'info', 'txtName' ).focus();
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js	(revision 2773)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/textfield.js	(revision 2774)
@@ -23,5 +23,5 @@
 	var addChange = function( name, input ){
 		var dialog = input.getDialog();
-		if( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
+		if ( input.isChanged() || ( dialog.editMode == false && input.getValue() != '' ))
 		{
 			dialog.changedAttibutes[ name ] = input.getValue();
@@ -36,12 +36,12 @@
 		minWidth : 400,
 		minHeight : 230,
-		onOk: function( data )
+		onOk : function()
 		{
-			for( var name in this.changedAttibutes )
+			for ( var name in this.changedAttibutes )
 			{
-				this.editObj.setAttribute(name, this.changedAttibutes[ name ] );
+				this.editObj.setAttribute( name, this.changedAttibutes[ name ] );
 			}
 
-			if( this.editMode == false )
+			if ( this.editMode == false )
 			{
 				this.restoreSelection();
@@ -50,8 +50,5 @@
 			return true;
 		},
-		onCancel: function()
-		{
-		},
-		onShow: function()
+		onShow : function()
 		{
 			this.editMode = false;
@@ -62,5 +59,5 @@
 			*/
 
-			if( this.editMode == false )	//New object.
+			if ( this.editMode == false )	//New object.
 			{
 				this.editObj = editor.document.createElement( 'input' );
@@ -88,5 +85,5 @@
 								'default' : '',
 								accessKey : 'N',
-								validate: function( data )
+								validate: function()
 								{
 									addChange( 'name', this );
@@ -100,5 +97,5 @@
 								'default' : '',
 								accessKey : 'V',
-								validate: function( data )
+								validate: function()
 								{
 									addChange( 'value', this );
@@ -120,5 +117,5 @@
 								accessKey : 'C',
 								style : 'width:50px',
-								validate: function( data )
+								validate: function()
 								{
 									if ( this.getValue() != '' )
@@ -142,5 +139,5 @@
 								accessKey : 'M',
 								style : 'width:50px',
-								validate: function( data )
+								validate: function()
 								{
 									if ( this.getValue() != '' )