Ticket #7900: 7900_2.patch

_source/plugins/showborders/plugin.js

@@ -115 +115 @@
                                                                         cssClass = attributes[ 'class' ],
                                                                         border = parseInt( attributes.border, 10 );
 
-                                                                if ( !border || border <= 0 )
+                                                                if ( ( !border || border <= 0 ) && ( !cssClass || cssClass.indexOf( showBorderClassName ) == -1 ) )
                                                                         attributes[ 'class' ] = ( cssClass || '' ) + ' ' + showBorderClassName;
                                                         }
                                                 }

_source/plugins/table/dialogs/table.js

@@ -15 +15 @@
                 data.info[id] = this.getValue();
         };
 
+        function tableColumns( table )
+        {
+                var cols = 0, maxCols = 0;
+                for ( var i = 0, row, rows = table.$.rows.length; i < rows; i++ )
+                {
+                        row = table.$.rows[ i ];
+                        for ( var j = 0, cell, cells = row.cells.length; j < cells; j++ )
+                        {
+                                cell = row.cells[ j ];
+                                cols += cell.colSpan;
+                        }
+
+                        cols > maxCols && ( maxCols = cols );
+                }
+
+                return maxCols;
+        }
+
         function tableDialog( editor, command )
         {
                 var makeElement = function( name )
@@ -304 +322 @@
                                                                                         },
                                                                                         setup : function( selectedTable )
                                                                                         {
-                                                                                                this.setValue( selectedTable.$.rows[0].cells.length);
+                                                                                                this.setValue( tableColumns( selectedTable ) );
                                                                                         },
                                                                                         commit : commitValue
                                                                                 },
@@ -334 +352 @@
                                                                                                 for ( var row = 0 ; row < selectedTable.$.rows.length ; row++ )
                                                                                                 {
                                                                                                         // If just one cell isn't a TH then it isn't a header column
-                                                                                                        if ( selectedTable.$.rows[row].cells[0].nodeName.toLowerCase() != 'th' )
+                                                                                                        var headCell = selectedTable.$.rows[row].cells[0];
+                                                                                                        if ( headCell && headCell.nodeName.toLowerCase() != 'th' )
                                                                                                         {
                                                                                                                 dialog.hasColumnHeaders = false;
                                                                                                                 break;