Ticket #8055: 8055_3.patch

_source/plugins/table/dialogs/table.js

@@ -523 +523 @@
                                                                                 {
                                                                                         var caption = nodeList.getItem( 0 );
 
-                                                                                        var innerHtml = caption.getHtml().replace(/<br>\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;
                                                                                         }
 
@@ -547 +545 @@
                                                                                 if ( caption )
                                                                                 {
                                                                                         if ( captionElement.count() > 0 )
-                                                                                        {
                                                                                                 captionElement = captionElement.getItem( 0 );
-                                                                                                captionElement.setHtml( '' );
-                                                                                        }
                                                                                         else
                                                                                         {
                                                                                                 captionElement = new CKEDITOR.dom.element( 'caption', editor.document );
-                                                                                                if ( table.getChildCount() )
-                                                                                                        captionElement.insertBefore( table.getFirst() );
-                                                                                                else
-                                                                                                        captionElement.appendTo( table );
+                                                                                                captionElement.appendTo( table, 1 );
                                                                                         }
-                                                                                        captionElement.append( new CKEDITOR.dom.text( caption, editor.document ) );
+
+                                                                                        captionElement.setText( caption );
                                                                                 }
                                                                                 else if ( captionElement.count() > 0 )
                                                                                 {