X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Ftable%2Fdialogs%2Ftable.js;h=215a373d4bfbf29834e47fa761f0c4b8e5264ed5;hp=461e36e64c7c0a96042d9f82a489b9f270a6e6f6;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d

diff --git a/_source/plugins/table/dialogs/table.js b/_source/plugins/table/dialogs/table.js
index 461e36e..215a373 100644
--- a/_source/plugins/table/dialogs/table.js
+++ b/_source/plugins/table/dialogs/table.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -68,6 +68,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			},
 			onOk : function()
 			{
+				if ( this._.selectedElement )
+				{
+					var selection = editor.getSelection(),
+						bms = editor.getSelection().createBookmarks();
+				}
+
 				var table = this._.selectedElement || makeElement( 'table' ),
 					me = this,
 					data = {};
@@ -174,22 +180,28 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					// Set the width and height.
 					var styles = [];
 					if ( info.txtHeight )
-						styles.push( 'height:' + info.txtHeight + 'px' );
+						table.setStyle( 'height', CKEDITOR.tools.cssLength( info.txtHeight ) );
+					else
+						table.removeStyle( 'height' );
+
 					if ( info.txtWidth )
 					{
 						var type = info.cmbWidthType || 'pixels';
-						styles.push( 'width:' + info.txtWidth + ( type == 'pixels' ? 'px' : '%' ) );
+						table.setStyle( 'width', info.txtWidth + ( type == 'pixels' ? 'px' : '%' ) );
 					}
-					styles = styles.join( ';' );
-					if ( styles )
-						table.$.style.cssText = styles;
 					else
+						table.removeStyle( 'width' );
+
+					if( !table.getAttribute( 'style' ) )
 						table.removeAttribute( 'style' );
 				}
 
 				// Insert the table element if we're creating one.
 				if ( !this._.selectedElement )
 					editor.insertElement( table );
+				// Properly restore the selection inside table. (#4822)
+				else
+					selection.selectBookmarks( bms );
 
 				return true;
 			},