\r
CKEDITOR.dialog.add( 'cellProperties', function( editor )\r
{\r
- var langTable = editor.lang.table;\r
- var langCell = langTable.cell;\r
- var langCommon = editor.lang.common;\r
- var validate = CKEDITOR.dialog.validate;\r
- var widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,\r
- heightPattern = /^(\d+(?:\.\d+)?)px$/;\r
- var bind = CKEDITOR.tools.bind;\r
-\r
- function spacer()\r
- {\r
- return { type : 'html', html : ' ' };\r
- }\r
+ var langTable = editor.lang.table,\r
+ langCell = langTable.cell,\r
+ langCommon = editor.lang.common,\r
+ validate = CKEDITOR.dialog.validate,\r
+ widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/,\r
+ heightPattern = /^(\d+(?:\.\d+)?)px$/,\r
+ bind = CKEDITOR.tools.bind,\r
+ spacer = { type : 'html', html : ' ' };\r
\r
/**\r
*\r
{\r
releaseHandlers( this );\r
};\r
- var bindToDialog = function( dialog )\r
- {\r
- dialog.on( 'ok', onOk );\r
- dialog.on( 'cancel', onCancel );\r
- };\r
var releaseHandlers = function( dialog )\r
{\r
dialog.removeListener( 'ok', onOk );\r
dialog.removeListener( 'cancel', onCancel );\r
};\r
+ var bindToDialog = function( dialog )\r
+ {\r
+ dialog.on( 'ok', onOk );\r
+ dialog.on( 'cancel', onCancel );\r
+ };\r
editor.execCommand( dialogName );\r
if ( editor._.storedDialogs.colordialog )\r
bindToDialog( editor._.storedDialogs.colordialog );\r
],\r
setup : function( selectedCell )\r
{\r
- var widthMatch = widthPattern.exec( selectedCell.$.style.width );\r
+ var widthMatch = widthPattern.exec( selectedCell.getStyle( 'width' ) || selectedCell.getAttribute( 'width' ) );\r
if ( widthMatch )\r
this.setValue( widthMatch[2] );\r
}\r
}\r
]\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'select',\r
id : 'wordWrap',\r
element.removeAttribute( 'noWrap' );\r
}\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'select',\r
id : 'hAlign',\r
}\r
]\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'vbox',\r
padding : 0,\r
selectedCell.renameNode( this.getValue() );\r
}\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'text',\r
id : 'rowSpan',\r
selectedCell.removeAttribute( 'colSpan' );\r
}\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'hbox',\r
padding : 0,\r
}\r
]\r
},\r
- spacer(),\r
+ spacer,\r
{\r
type : 'hbox',\r
padding : 0,\r