/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
\r
if ( command == 'tableProperties' )\r
{\r
- if ( ( selectedTable = editor.getSelection().getSelectedElement() ) )\r
- {\r
- if ( selectedTable.getName() != 'table' )\r
- selectedTable = null;\r
- }\r
+ if ( ( selectedTable = selection.getSelectedElement() ) )\r
+ selectedTable = selectedTable.getAscendant( 'table', true );\r
else if ( ranges.length > 0 )\r
{\r
// Webkit could report the following range on cell selection (#4948):\r
if ( this._.selectedElement )\r
{\r
var selection = editor.getSelection(),\r
- bms = editor.getSelection().createBookmarks();\r
+ bms = selection.createBookmarks();\r
}\r
\r
var table = this._.selectedElement || makeElement( 'table' ),\r
for ( i = 0 ; i < theRow.getChildCount() ; i++ )\r
{\r
var th = theRow.getChild( i );\r
- if ( th.type == CKEDITOR.NODE_ELEMENT )\r
+ // Skip bookmark nodes. (#6155)\r
+ if ( th.type == CKEDITOR.NODE_ELEMENT && !th.data( 'cke-bookmark' ) )\r
{\r
th.renameNode( 'th' );\r
th.setAttribute( 'scope', 'col' );\r
id : 'cmbAlign',\r
type : 'select',\r
'default' : '',\r
- label : editor.lang.table.align,\r
+ label : editor.lang.common.align,\r
items :\r
[\r
[ editor.lang.common.notSet , ''],\r
- [ editor.lang.table.alignLeft , 'left'],\r
- [ editor.lang.table.alignCenter , 'center'],\r
- [ editor.lang.table.alignRight , 'right']\r
+ [ editor.lang.common.alignLeft , 'left'],\r
+ [ editor.lang.common.alignCenter , 'center'],\r
+ [ editor.lang.common.alignRight , 'right']\r
],\r
setup : function( selectedTable )\r
{\r
type : 'text',\r
id : 'txtWidth',\r
style : 'width:5em',\r
- label : editor.lang.table.width,\r
+ label : editor.lang.common.width,\r
'default' : 500,\r
validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidWidth ),\r
\r
type : 'text',\r
id : 'txtHeight',\r
style : 'width:5em',\r
- label : editor.lang.table.height,\r
+ label : editor.lang.common.height,\r
'default' : '',\r
validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidHeight ),\r
\r
if ( nodeList.count() > 0 )\r
{\r
var caption = nodeList.getItem( 0 );\r
- caption = ( caption.getChild( 0 ) && caption.getChild( 0 ).getText() ) || '';\r
- caption = CKEDITOR.tools.trim( caption );\r
+ caption = CKEDITOR.tools.trim( caption.getText() );\r
this.setValue( caption );\r
}\r
},\r