vanilla ckeditor-3.2

[ckeditor.git] / _source / plugins / table / dialogs / table.js

diff --git a/_source/plugins/table/dialogs/table.js b/_source/plugins/table/dialogs/table.js
index 6a082d2..87e55df 100644 (file)
--- a/_source/plugins/table/dialogs/table.js
+++ b/_source/plugins/table/dialogs/table.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -68,6 +68,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        },\r
                        onOk : function()\r
                        {\r
+                               if ( this._.selectedElement )\r
+                               {\r
+                                       var selection = editor.getSelection(),\r
+                                               bms = editor.getSelection().createBookmarks();\r
+                               }\r
+\r
                                var table = this._.selectedElement || makeElement( 'table' ),\r
                                        me = this,\r
                                        data = {};\r
@@ -148,7 +154,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        // Should we make all first cells in a row TH?\r
                                        if ( !this.hasColumnHeaders && ( headers == 'col' || headers == 'both' ) )\r
                                        {\r
-                                               for( row = 0 ; row < table.$.rows.length ; row++ )\r
+                                               for ( row = 0 ; row < table.$.rows.length ; row++ )\r
                                                {\r
                                                        newCell = new CKEDITOR.dom.element( table.$.rows[ row ].cells[ 0 ] );\r
                                                        newCell.renameNode( 'th' );\r
@@ -159,7 +165,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        // Should we make all first TH-cells in a row make TD? If 'yes' we do it the other way round :-)\r
                                        if ( ( this.hasColumnHeaders ) && !( headers == 'col' || headers == 'both' ) )\r
                                        {\r
-                                               for( i = 0 ; i < table.$.rows.length ; i++ )\r
+                                               for ( i = 0 ; i < table.$.rows.length ; i++ )\r
                                                {\r
                                                        row = new CKEDITOR.dom.element( table.$.rows[i] );\r
                                                        if ( row.getParent().getName() == 'tbody' )\r
@@ -186,13 +192,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        else\r
                                                table.removeStyle( 'width' );\r
 \r
-                                       if( !table.getAttribute( 'style' ) )\r
+                                       if ( !table.getAttribute( 'style' ) )\r
                                                table.removeAttribute( 'style' );\r
                                }\r
 \r
                                // Insert the table element if we're creating one.\r
                                if ( !this._.selectedElement )\r
                                        editor.insertElement( table );\r
+                               // Properly restore the selection inside table. (#4822)\r
+                               else\r
+                                       selection.selectBookmarks( bms );\r
 \r
                                return true;\r
                        },\r
@@ -330,7 +339,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                        label : editor.lang.table.align,\r
                                                                                        items :\r
                                                                                        [\r
-                                                                                               [ editor.lang.table.alignNotSet , ''],\r
+                                                                                               [ editor.lang.common.notSet , ''],\r
                                                                                                [ editor.lang.table.alignLeft , 'left'],\r
                                                                                                [ editor.lang.table.alignCenter , 'center'],\r
                                                                                                [ editor.lang.table.alignRight , 'right']\r
@@ -366,18 +375,33 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                        label : editor.lang.table.width,\r
                                                                                                        'default' : 200,\r
                                                                                                        validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidWidth ),\r
+\r
+                                                                                                       // Extra labelling of width unit type.\r
+                                                                                                       onLoad : function()\r
+                                                                                                       {\r
+                                                                                                               var widthType = this.getDialog().getContentElement( 'info', 'cmbWidthType' ),\r
+                                                                                                                       labelElement = widthType.getElement(),\r
+                                                                                                                       inputElement = this.getInputElement(),\r
+                                                                                                                       ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );\r
+\r
+                                                                                                               inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );\r
+                                                                                                       },\r
+\r
                                                                                                        setup : function( selectedTable )\r
                                                                                                        {\r
                                                                                                                var widthMatch = widthPattern.exec( selectedTable.$.style.width );\r
                                                                                                                if ( widthMatch )\r
                                                                                                                        this.setValue( widthMatch[1] );\r
+                                                                                                               else\r
+                                                                                                                       this.setValue( '' );\r
                                                                                                        },\r
                                                                                                        commit : commitValue\r
                                                                                                },\r
                                                                                                {\r
                                                                                                        id : 'cmbWidthType',\r
                                                                                                        type : 'select',\r
-                                                                                                       label : '&nbsp;',\r
+                                                                                                       label : editor.lang.table.widthUnit,\r
+                                                                                                       labelStyle: 'visibility:hidden',\r
                                                                                                        'default' : 'pixels',\r
                                                                                                        items :\r
                                                                                                        [\r
@@ -406,6 +430,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                        label : editor.lang.table.height,\r
                                                                                                        'default' : '',\r
                                                                                                        validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidHeight ),\r
+\r
+                                                                                                       // Extra labelling of height unit type.\r
+                                                                                                       onLoad : function()\r
+                                                                                                       {\r
+                                                                                                               var heightType = this.getDialog().getContentElement( 'info', 'htmlHeightType' ),\r
+                                                                                                                       labelElement = heightType.getElement(),\r
+                                                                                                                       inputElement = this.getInputElement(),\r
+                                                                                                                       ariaLabelledByAttr = inputElement.getAttribute( 'aria-labelledby' );\r
+\r
+                                                                                                               inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );\r
+                                                                                                       },\r
+\r
                                                                                                        setup : function( selectedTable )\r
                                                                                                        {\r
                                                                                                                var heightMatch = heightPattern.exec( selectedTable.$.style.height );\r
@@ -415,8 +451,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                                        commit : commitValue\r
                                                                                                },\r
                                                                                                {\r
+                                                                                                       id : 'htmlHeightType',\r
                                                                                                        type : 'html',\r
-                                                                                                       html : '<br />' + editor.lang.table.widthPx\r
+                                                                                                       html : '<div><br />' + editor.lang.table.widthPx + '</div>'\r
                                                                                                }\r
                                                                                        ]\r
                                                                                },\r