Ticket #3830: 3830_3.patch

_source/plugins/tabletools/dialogs/tableCell.js

@@ -314 +314 @@
                         ],
                         onShow : function()
                         {
-                                // Get the selected table cell.
-                                var startElement = editor.getSelection().getStartElement();
-                                this.cell = startElement.getAscendant( 'td', true ) || startElement.getAscendant( 'th', true );
-
-                                // Call setupContent().
-                                this.setupContent( this.cell );
+                                this.cells = CKEDITOR.plugins.tabletools.getSelectedCells(
+                                        this._.editor.getSelection() );
+                                this.setupContent( this.cells[ 0 ] );
                         },
                         onOk : function()
                         {
-                                // Call commitContent().
-                                this.commitContent( this.cell );
+                                var cells = this.cells
+                                for ( var i = 0 ; i < cells.length ; i++ )
+                                        this.commitContent( cells[ i ] );
                         }
                 };
         } );

_source/plugins/tabletools/plugin.js

@@ -416 +416 @@
                 }
         }
 
-        CKEDITOR.plugins.add( 'tabletools',
+        CKEDITOR.plugins.tabletools =
         {
                 init : function( editor )
                 {
@@ -544 +544 @@
                                                         getItems : function()
                                                         {
                                                                 var cells = getSelectedCells( editor.getSelection() );
-
                                                                 return {
                                                                         tablecell_insertBefore : CKEDITOR.TRISTATE_OFF,
                                                                         tablecell_insertAfter : CKEDITOR.TRISTATE_OFF,
                                                                         tablecell_delete : CKEDITOR.TRISTATE_OFF,
-                                                                        tablecell_properties : cells.length == 1 ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED
+                                                                        tablecell_properties : cells.length > 0 ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED
                                                                 };
                                                         }
                                                 },
@@ -688 +687 @@
                                                         return null;
                                         } );
                         }
-                }
-        } );
+                },
+
+                getSelectedCells : getSelectedCells
+
+        };
+        CKEDITOR.plugins.add( 'tabletools', CKEDITOR.plugins.tabletools );
 })();

CHANGES.html

@@ -46 +46 @@
         <ul>
                 <li><a href="http://dev.fckeditor.net/ticket/3819">#3819</a> : The cursor was not visible
                         when applying style to collapsed selections in Firefox 2.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3830">#3830</a> : Table cell properties dialog
+                        doesn't apply to all selected cells.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>