Ticket #7886: 7886.patch

_source/plugins/table/dialogs/table.js

@@ -93 +93 @@
                                         }
 
                                         // Save a reference to the selected table, and push a new set of default values.
-                                        this._.selectedElement = selectedTable;
+                                        this.element = selectedTable;
                                 }
 
                                 // Enable or disable the row, cols, width fields.
@@ -116 +116 @@
                         },
                         onOk : function()
                         {
-                                if ( this._.selectedElement )
+                                if ( this.element )
                                 {
                                         var selection = editor.getSelection(),
                                                 bms = selection.createBookmarks();
                                 }
 
-                                var table = this._.selectedElement || makeElement( 'table' ),
+                                var table = this.element || ( this.element = makeElement( 'table' ) ),
                                         me = this,
                                         data = {};
 
@@ -133 +133 @@
                                         var info = data.info;
 
                                         // Generate the rows and cols.
-                                        if ( !this._.selectedElement )
+                                        if ( this.element.isOffline() )
                                         {
                                                 var tbody = table.append( makeElement( 'tbody' ) ),
                                                         rows = parseInt( info.txtRows, 10 ) || 0,
@@ -246 +246 @@
                                 }
 
                                 // Insert the table element if we're creating one.
-                                if ( !this._.selectedElement )
+                                if ( table.isOffline() )
                                         editor.insertElement( table );
                                 // Properly restore the selection inside table. (#4822)
                                 else

_source/plugins/showborders/plugin.js

@@ -151 +151 @@
 
                 if ( dialogName == 'table' || dialogName == 'tableProperties' )
                 {
-                        var dialogDefinition = ev.data.definition,
-                                infoTab = dialogDefinition.getContents( 'info' ),
-                                borderField = infoTab.get( 'txtBorder' ),
-                                originalCommit = borderField.commit;
+                        var dialogDefinition = ev.data.definition;
 
-                        borderField.commit = CKEDITOR.tools.override( originalCommit, function( org )
-                        {
-                                return function( data, selectedTable )
-                                        {
-                                                org.apply( this, arguments );
-                                                var value = parseInt( this.getValue(), 10 );
-                                                selectedTable[ ( !value || value <= 0 ) ? 'addClass' : 'removeClass' ]( showBorderClassName );
-                                        };
-                        } );
-
                         var advTab = dialogDefinition.getContents( 'advanced' ),
                                 classField = advTab && advTab.get( 'advCSSClasses' );
 
@@ -179 +166 @@
                                                                 this.setValue( this.getValue().replace( /cke_show_border/, '' ) );
                                                         };
                                         });
+                        }
 
-                                classField.commit = CKEDITOR.tools.override( classField.commit, function( originalCommit )
-                                        {
-                                                return function( data, element )
-                                                        {
-                                                                originalCommit.apply( this, arguments );
-
-                                                                if ( !parseInt( element.getAttribute( 'border' ), 10 ) )
-                                                                        element.addClass( 'cke_show_border' );
-                                                        };
-                                        });
-                        }
-                }
+                        dialogDefinition.onOk = CKEDITOR.tools.override( dialogDefinition.onOk, function( org )
+                                {
+                                        return function()
+                                                {
+                                                        org.apply( this, arguments );
+                                                        var border = parseInt( this.element.getAttribute( 'border' ), 10 );
+                                                        this.element[ !isNaN( border) && border > 0 ?  'removeClass' : 'addClass' ]( showBorderClassName );
+                                                };
+                                });
+
+                }
         });
 
 } )();

_source/core/dom/element.js

@@ -1568 +1568 @@
                         return this.$.childNodes.length;
                 },
 
+                /**
+                 *  Whether this element is not yet presented in the DOM tree.
+                 */
+                isOffline : function()
+                {
+                        var root = this.getDocument().getDocumentElement();
+                        return !root.contains( this );
+                },
+
                 disableContextMenu : function()
                 {
                         this.on( 'contextmenu', function( event )