Roo/htmleditor/BlockTd.js

diff --git a/Roo/htmleditor/BlockTd.js b/Roo/htmleditor/BlockTd.js
index 3d486b5..4686131 100644 (file)
--- a/Roo/htmleditor/BlockTd.js
+++ b/Roo/htmleditor/BlockTd.js
@@ -392,13 +392,13 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
     mergeBelow : function()
     {
         var table = this.toTableArray();
-        if (typeof(table[this.cellData.row+1]) == 'undefined') {
+        if (typeof(table[this.cellData.row+this.cellData.rowspan]) == 'undefined') {
             return; // no row below
         }
-        if (typeof(table[this.cellData.row+1][this.cellData.col]) == 'undefined') {
+        if (typeof(table[this.cellData.row+this.cellData.rowspan][this.cellData.col]) == 'undefined') {
             return; // nothing right?
         }
-        var rc = table[this.cellData.row+1][this.cellData.col];
+        var rc = table[this.cellData.row+this.cellData.rowspan][this.cellData.col];
         
         if (rc.colspan != this.cellData.colspan || rc.col != this.cellData.col) {
             return; // right hand side is not same rowspan.