Ticket #3830: 3830.patch

_source/plugins/tabletools/dialogs/tableCell.js

@@ -311 +311 @@
                                                 }
                                         ]
                                 }
-                        ],
-                        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 );
-                        },
-                        onOk : function()
-                        {
-                                // Call commitContent().
-                                this.commitContent( this.cell );
-                        }
+                        ]
                 };
         } );

_source/plugins/tabletools/plugin.js

@@ -424 +424 @@
 
                         editor.addCommand( 'cellProperties', new CKEDITOR.dialogCommand( 'cellProperties' ) );
                         CKEDITOR.dialog.add( 'cellProperties', this.path + 'dialogs/tableCell.js' );
+                        // Initialize table cell properties dialog.
+                        CKEDITOR.on( 'dialogDefinition', function( evt ){
 
+                                if ( evt.data.name == 'cellProperties' )
+                                {
+                                        var definition = evt.data.definition;
+                                        definition.onShow = function()
+                                        {
+                                                this.cells = getSelectedCells( editor.getSelection() );
+                                                this.setupContent( this.cells[ 0 ] );
+                                        };
+                                        definition.onOk = function()
+                                        {
+                                                var cells = this.cells
+                                                for ( var i = 0 ; i < cells.length ; i++ )
+                                                        this.commitContent( cells[ i ] );
+                                        };
+                                }
+                        } );
+
                         editor.addCommand( 'tableDelete',
                                 {
                                         exec : function( editor )
@@ -544 +563 @@
                                                         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
                                                                 };
                                                         }
                                                 },

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>