Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 7056)
+++ /CKEditor/trunk/CHANGES.html (revision 7057)
@@ -102,4 +102,5 @@
#7839 : [IE] Pasting multi-level numbered lists from Microsoft Word does not work properly.
#188 : [IE] Object selection was making the toolbar inactive in some situations.
+ #8055 : Allow HTML entities inside table caption to be edited in dialog.
Updated the following language files:
- #7834 : Dutch;
Index: /CKEditor/trunk/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 7056)
+++ /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 7057)
@@ -524,11 +524,9 @@
var caption = nodeList.getItem( 0 );
- var innerHtml = caption.getHtml().replace(/
\s*$/i, ''),
- innerText = caption.getText();
-
- if ( innerHtml != innerText )
+ var firstElementChild = caption.getFirst( CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT ) )
+ if ( firstElementChild && !firstElementChild.equals( caption.getBogus() ) )
{
this.disable();
- this.setValue( innerText );
+ this.setValue( caption.getText() );
return;
}