\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.hasAttribute( '_cke_bookmark' ) )\r
{\r
th.renameNode( 'th' );\r
th.setAttribute( 'scope', 'col' );\r