Changeset 6991 for CKEditor/trunk

Timestamp:

05/31/11 14:34:21 (2 years ago)

Author:

Saare

Message:

#7841: Deleting a column with a deleted cell in one of the rows not working.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/tabletools/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -90 +90 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6975">#6975</a> : Definition list crashes IE6/7 on html output.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7492">#7492</a> : Overrides of Styles don't work on the same element tag.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7841">#7841</a> : Deleting a column with a deleted cell in one of the rows not working.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>

CKEditor/trunk/_source/plugins/tabletools/plugin.js

@@ -342 +342 @@
                                         cell = new CKEDITOR.dom.element( mapRow[ i ] );
 
-                                if ( cell.$.colSpan == 1 )
-                                        cell.remove();
-                                // Reduce the col spans.
-                                else
-                                        cell.$.colSpan -= 1;
-
-                                j += cell.$.rowSpan - 1;
-
-                                if ( !row.$.cells.length )
-                                        rowsToDelete.push( row );
+                                if ( cell.$ )
+                                {
+                                        if ( cell.$.colSpan == 1 )
+                                                cell.remove();
+                                        // Reduce the col spans.
+                                        else
+                                                cell.$.colSpan -= 1;
+
+                                        j += cell.$.rowSpan - 1;
+
+                                        if ( !row.$.cells.length )
+                                                rowsToDelete.push( row );
+                                }
                         }
                 }