Ticket #1917: 1917.patch
File 1917.patch, 1.6 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
64 64 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2322">#2322</a>] Fixed the issue 65 65 where the fit window command loses the current selection and scroll position in the 66 66 editing area.</li> 67 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1917">#1917</a>] Fixed the issue 68 where the merge down command for tables cells does not work in IE for more than two 69 cells.</li> 67 70 </ul> 68 71 <p> 69 72 <a href="_whatsnew_history.html">See previous versions history</a></p> -
editor/_source/internals/fcktablehandler.js
692 692 var cell = tableMap[i][j] ; 693 693 if ( cell.parentNode ) 694 694 cell.parentNode.removeChild( cell ) ; 695 cell.colSpan = cell.rowSpan =1 ;695 cell.colSpan = 1 ; 696 696 } 697 697 } 698 698 … … 719 719 // Scan by columns and set rowSpan. 720 720 for ( var i = 0 ; i <= maxCol ; i++ ) 721 721 { 722 var rowSpan = 1 ; 723 722 724 for ( var j = 0 ; j < tableMap.length ; j++ ) 723 725 { 724 726 if ( ! tableMap[j] ) … … 727 729 if ( ! cell || cell._rowScanned === true ) 728 730 continue ; 729 731 if ( tableMap[j-1] && tableMap[j-1][i] == cell ) 730 cell.rowSpan++ ; 732 cell.rowSpan = ++rowSpan ; 733 else 734 rowSpan = 1 ; 731 735 if ( ! tableMap[j+1] || tableMap[j+1][i] != cell ) 732 736 cell._rowScanned = true ; 733 737 }