X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftabletools%2Fdialogs%2FtableCell.js;h=d37cd1040d5c90fa00f7a65e4c35076931cb5c53;hb=4e90e78dc97789709ee7404359a5517540c27553;hp=7518ab152c55cc7cc9cd827ebe96b3de68e1e141;hpb=055b6b0792ce7dc53d47af606b367c04b927c2ab;p=ckeditor.git

diff --git a/_source/plugins/tabletools/dialogs/tableCell.js b/_source/plugins/tabletools/dialogs/tableCell.js
index 7518ab1..d37cd10 100644
--- a/_source/plugins/tabletools/dialogs/tableCell.js
+++ b/_source/plugins/tabletools/dialogs/tableCell.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
 */
 
@@ -12,7 +12,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 			widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,
 			heightPattern = /^(\d+(?:\.\d+)?)px$/,
 			bind = CKEDITOR.tools.bind,
-			spacer = { type : 'html', html : ' ' };
+			spacer = { type : 'html', html : ' ' },
+			rtl = editor.lang.dir == 'rtl';
 
 		/**
 		 *
@@ -24,11 +25,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 			var onOk = function()
 			{
 				releaseHandlers( this );
-				callback( this );
+				callback( this, this._.parentDialog );
+				this._.parentDialog.changeFocus( true );
 			};
 			var onCancel = function()
 			{
 				releaseHandlers( this );
+				this._.parentDialog.changeFocus();
 			};
 			var releaseHandlers = function( dialog )
 			{
@@ -69,8 +72,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 
 		return {
 			title : langCell.title,
-			minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 550 : 480,
-			minHeight : CKEDITOR.env.ie ? ( CKEDITOR.env.quirks ? 180 : 150 ) : 140,
+			minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks? 450 : 410,
+			minHeight : CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks )?  230 : 200,
 			contents : [
 				{
 					id : 'info',
@@ -96,9 +99,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													type : 'text',
 													id : 'width',
-													label : langTable.width,
-													widths : [ '71%', '29%' ],
-													labelLayout : 'horizontal',
+													width: '100px',
+													label : langCommon.width,
 													validate : validate[ 'number' ]( langCell.invalidWidth ),
 
 													// Extra labelling of width unit type.
@@ -137,10 +139,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													type : 'select',
 													id : 'widthType',
-													labelLayout : 'horizontal',
-													widths : [ '0%', '100%' ],
 													label : editor.lang.table.widthUnit,
-													labelStyle: 'display:none',
+													labelStyle: 'visibility:hidden',
 													'default' : 'px',
 													items :
 													[
@@ -164,10 +164,9 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													type : 'text',
 													id : 'height',
-													label : langTable.height,
+													label : langCommon.height,
+													width: '100px',
 													'default' : '',
-													widths : [ '71%', '29%' ],
-													labelLayout : 'horizontal',
 													validate : validate[ 'number' ]( langCell.invalidHeight ),
 
 													// Extra labelling of height unit type.
@@ -204,7 +203,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													id : 'htmlHeightType',
 													type : 'html',
-													html : langTable.widthPx
+													html : '<br />'+ langTable.widthPx
 												}
 											]
 										},
@@ -212,9 +211,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										{
 											type : 'select',
 											id : 'wordWrap',
-											labelLayout : 'horizontal',
 											label : langCell.wordWrap,
-											widths : [ '50%', '50%' ],
 											'default' : 'yes',
 											items :
 											[
@@ -243,16 +240,14 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										{
 											type : 'select',
 											id : 'hAlign',
-											labelLayout : 'horizontal',
 											label : langCell.hAlign,
-											widths : [ '50%', '50%' ],
 											'default' : '',
 											items :
 											[
 												[ langCommon.notSet, '' ],
-												[ langTable.alignLeft, 'left' ],
-												[ langTable.alignCenter, 'center' ],
-												[ langTable.alignRight, 'right' ]
+												[ langCommon.alignLeft, 'left' ],
+												[ langCommon.alignCenter, 'center' ],
+												[ langCommon.alignRight, 'right' ]
 											],
 											setup : function( element )
 											{
@@ -276,16 +271,14 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										{
 											type : 'select',
 											id : 'vAlign',
-											labelLayout : 'horizontal',
 											label : langCell.vAlign,
-											widths : [ '50%', '50%' ],
 											'default' : '',
 											items :
 											[
 												[ langCommon.notSet, '' ],
-												[ langCell.alignTop, 'top' ],
-												[ langCell.alignMiddle, 'middle' ],
-												[ langCell.alignBottom, 'bottom' ],
+												[ langCommon.alignTop, 'top' ],
+												[ langCommon.alignMiddle, 'middle' ],
+												[ langCommon.alignBottom, 'bottom' ],
 												[ langCell.alignBaseline, 'baseline' ]
 											],
 											setup : function( element )
@@ -331,8 +324,6 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 											type : 'select',
 											id : 'cellType',
 											label : langCell.cellType,
-											labelLayout : 'horizontal',
-											widths : [ '50%', '50%' ],
 											'default' : 'td',
 											items :
 											[
@@ -353,8 +344,6 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 											type : 'text',
 											id : 'rowSpan',
 											label : langCell.rowSpan,
-											labelLayout : 'horizontal',
-											widths : [ '50%', '50%' ],
 											'default' : '',
 											validate : validate.integer( langCell.invalidRowSpan ),
 											setup : function( selectedCell )
@@ -376,8 +365,6 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 											type : 'text',
 											id : 'colSpan',
 											label : langCell.colSpan,
-											labelLayout : 'horizontal',
-											widths : [ '50%', '50%' ],
 											'default' : '',
 											validate : validate.integer( langCell.invalidColSpan ),
 											setup : function( element )
@@ -399,15 +386,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										{
 											type : 'hbox',
 											padding : 0,
-											widths : [ '80%', '20%' ],
+											widths : [ '60%', '40%' ],
 											children :
 											[
 												{
 													type : 'text',
 													id : 'bgColor',
 													label : langCell.bgColor,
-													labelLayout : 'horizontal',
-													widths : [ '70%', '30%' ],
 													'default' : '',
 													setup : function( element )
 													{
@@ -431,8 +416,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													type : 'button',
 													id : 'bgColorChoose',
+													"class" : 'colorChooser',
 													label : langCell.chooseColor,
-													style : 'margin-left: 10px',
+													onLoad : function()
+													{
+														// Stick the element to the bottom (#5587)
+														this.getElement().getParent().setStyle( 'vertical-align', 'bottom' );
+													},
 													onClick : function()
 													{
 														var self = this;
@@ -450,15 +440,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										{
 											type : 'hbox',
 											padding : 0,
-											widths : [ '80%', '20%' ],
+											widths : [ '60%', '40%' ],
 											children :
 											[
 												{
 													type : 'text',
 													id : 'borderColor',
 													label : langCell.borderColor,
-													labelLayout : 'horizontal',
-													widths : [ '70%', '30%' ],
 													'default' : '',
 													setup : function( element )
 													{
@@ -481,8 +469,14 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												{
 													type : 'button',
 													id : 'borderColorChoose',
+													"class" : 'colorChooser',
 													label : langCell.chooseColor,
-													style : 'margin-left: 10px',
+													style : ( rtl ? 'margin-right' : 'margin-left' ) + ': 10px',
+													onLoad : function()
+													{
+														// Stick the element to the bottom (#5587)
+														this.getElement().getParent().setStyle( 'vertical-align', 'bottom' );
+													},
 													onClick : function()
 													{
 														var self = this;
@@ -519,6 +513,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 					this.commitContent( cells[ i ] );
 
 				selection.selectBookmarks( bookmarks );
+
+				// Force selectionChange event because of alignment style.
+				var firstElement = selection.getStartElement();
+				var currentPath = new CKEDITOR.dom.elementPath( firstElement );
+
+				this._.editor._.selectionPreviousPath = currentPath;
+				this._.editor.fire( 'selectionChange', { selection : selection, path : currentPath, element : firstElement } );
 			}
 		};
 	} );