X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Ftabletools%2Fdialogs%2FtableCell.js;h=1393e2460bc9a55dc40375ed7aab027ed4d1042a;hb=refs%2Ftags%2Fv3.4.1;hp=d25503456279d02af19b2f722bf4ca41532e3d13;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git

diff --git a/_source/plugins/tabletools/dialogs/tableCell.js b/_source/plugins/tabletools/dialogs/tableCell.js
index d255034..1393e24 100644
--- a/_source/plugins/tabletools/dialogs/tableCell.js
+++ b/_source/plugins/tabletools/dialogs/tableCell.js
@@ -5,18 +5,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 CKEDITOR.dialog.add( 'cellProperties', function( editor )
 	{
-		var langTable = editor.lang.table;
-		var langCell = langTable.cell;
-		var langCommon = editor.lang.common;
-		var validate = CKEDITOR.dialog.validate;
-		var widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,
-			heightPattern = /^(\d+(?:\.\d+)?)px$/;
-		var bind = CKEDITOR.tools.bind;
-
-		function spacer()
-		{
-			return { type : 'html', html : ' ' };
-		}
+		var langTable = editor.lang.table,
+			langCell = langTable.cell,
+			langCommon = editor.lang.common,
+			validate = CKEDITOR.dialog.validate,
+			widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,
+			heightPattern = /^(\d+(?:\.\d+)?)px$/,
+			bind = CKEDITOR.tools.bind,
+			spacer = { type : 'html', html : ' ' };
 
 		/**
 		 *
@@ -28,22 +24,24 @@ 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 );
-			};
-			var bindToDialog = function( dialog )
-			{
-				dialog.on( 'ok', onOk );
-				dialog.on( 'cancel', onCancel );
+				this._.parentDialog.changeFocus();
 			};
 			var releaseHandlers = function( dialog )
 			{
 				dialog.removeListener( 'ok', onOk );
 				dialog.removeListener( 'cancel', onCancel );
 			};
+			var bindToDialog = function( dialog )
+			{
+				dialog.on( 'ok', onOk );
+				dialog.on( 'cancel', onCancel );
+			};
 			editor.execCommand( dialogName );
 			if ( editor._.storedDialogs.colordialog )
 				bindToDialog( editor._.storedDialogs.colordialog );
@@ -104,6 +102,18 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													widths : [ '71%', '29%' ],
 													labelLayout : 'horizontal',
 													validate : validate[ 'number' ]( langCell.invalidWidth ),
+
+													// Extra labelling of width unit type.
+													onLoad : function()
+													{
+														var widthType = this.getDialog().getContentElement( 'info', 'widthType' ),
+															labelElement = widthType.getElement(),
+															inputElement = this.getInputElement(),
+															ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );
+
+														inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+													},
+
 													setup : function( element )
 													{
 														var widthAttr = parseInt( element.getAttribute( 'width' ), 10 ),
@@ -131,7 +141,8 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													id : 'widthType',
 													labelLayout : 'horizontal',
 													widths : [ '0%', '100%' ],
-													label : '',
+													label : editor.lang.table.widthUnit,
+													labelStyle: 'display:none',
 													'default' : 'px',
 													items :
 													[
@@ -140,7 +151,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													],
 													setup : function( selectedCell )
 													{
-														var widthMatch = widthPattern.exec( selectedCell.$.style.width );
+														var widthMatch = widthPattern.exec( selectedCell.getStyle( 'width' ) || selectedCell.getAttribute( 'width' ) );
 														if ( widthMatch )
 															this.setValue( widthMatch[2] );
 													}
@@ -160,6 +171,18 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													widths : [ '71%', '29%' ],
 													labelLayout : 'horizontal',
 													validate : validate[ 'number' ]( langCell.invalidHeight ),
+
+													// Extra labelling of height unit type.
+													onLoad : function()
+													{
+														var heightType = this.getDialog().getContentElement( 'info', 'htmlHeightType' ),
+															labelElement = heightType.getElement(),
+															inputElement = this.getInputElement(),
+															ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );
+
+														inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+													},
+
 													setup : function( element )
 													{
 														var heightAttr = parseInt( element.getAttribute( 'height' ), 10 ),
@@ -181,12 +204,13 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													}
 												},
 												{
+													id : 'htmlHeightType',
 													type : 'html',
 													html : langTable.widthPx
 												}
 											]
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'select',
 											id : 'wordWrap',
@@ -217,7 +241,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												element.removeAttribute( 'noWrap' );
 											}
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'select',
 											id : 'hAlign',
@@ -299,7 +323,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 										}
 									]
 								},
-								spacer(),
+								spacer,
 								{
 									type : 'vbox',
 									padding : 0,
@@ -326,7 +350,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												selectedCell.renameNode( this.getValue() );
 											}
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'text',
 											id : 'rowSpan',
@@ -373,7 +397,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 													selectedCell.removeAttribute( 'colSpan' );
 											}
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'hbox',
 											padding : 0,
@@ -424,7 +448,7 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 												}
 											]
 										},
-										spacer(),
+										spacer,
 										{
 											type : 'hbox',
 											padding : 0,
@@ -489,9 +513,21 @@ CKEDITOR.dialog.add( 'cellProperties', function( editor )
 			},
 			onOk : function()
 			{
+				var selection = this._.editor.getSelection(),
+					bookmarks = selection.createBookmarks();
+
 				var cells = this.cells;
 				for ( var i = 0 ; i < cells.length ; i++ )
 					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 } );
 			}
 		};
 	} );