Changeset 2158

Timestamp:

2008-07-03 12:22:20 (21 months ago)

Author:

martinkou

Message:

Fixed #1917 : Fixed the issue where the merge down command for tables cells does not work in IE for more than two cells.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fcktablehandler.js (modified) (4 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fcktablehandler.js

@@ -678 +678 @@
 FCKTableHandler._InstallTableMap = function( tableMap, table )
 {
+        // Workaround for #1917 : MSIE will always report a cell's rowSpan as 1 as long
+        // as the cell is not attached to a row. So we'll need an alternative attribute
+        // for storing the calculated rowSpan in IE.
+        var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
+
         // Clear the table of all rows first.
         while ( table.rows.length > 0 )
@@ -693 +698 @@
                         if ( cell.parentNode )
                                 cell.parentNode.removeChild( cell ) ;
-                        cell.colSpan = cell.rowSpan = 1 ;
+                        cell.colSpan = cell[rowSpanAttr] = 1 ;
                 }
         }
@@ -728 +733 @@
                                 continue ;
                         if ( tableMap[j-1] && tableMap[j-1][i] == cell )
-                                cell.rowSpan++ ;
+                                cell[rowSpanAttr]++ ;
                         if ( ! tableMap[j+1] || tableMap[j+1][i] != cell )
                                 cell._rowScanned = true ;
@@ -766 +771 @@
                         }
                         rowObj.appendChild( cell ) ;
+                        if ( rowSpanAttr != 'rowSpan' )
+                        {
+                                cell.rowSpan = cell[rowSpanAttr] ;
+                                cell.removeAttribute( rowSpanAttr ) ;
+                        }
                         j += cell.colSpan ;
                         if ( cell.colSpan == 1 )

FCKeditor/trunk/_whatsnew.html

@@ -68 +68 @@
                         where the fit window command loses the current selection and scroll position in the
                         editing area.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1917">#1917</a>] Fixed the issue
+                        where the merge down command for tables cells does not work in IE for more than two
+                        cells.</li>
         </ul>
         <p>