Roo/htmleditor/BlockTd.js

diff --git a/Roo/htmleditor/BlockTd.js b/Roo/htmleditor/BlockTd.js
index 1b9345a..9a08a1c 100644 (file)
--- a/Roo/htmleditor/BlockTd.js
+++ b/Roo/htmleditor/BlockTd.js
@@ -406,7 +406,7 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
         this.node.innerHTML =  this.node.innerHTML + rc.cell.innerHTML ;
         rc.cell.parentNode.removeChild(rc.cell);
         this.rowspan++;
-        this.node.setAttribute('rowspan', this.colspan);
+        this.node.setAttribute('rowspan', this.rowspan);
     },
     
     mergeAbove : function()
@@ -426,7 +426,7 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
         this.node.innerHTML =  rc.cell.innerHTML + this.node.innerHTML ;
         rc.cell.parentNode.removeChild(rc.cell);
         this.rowspan++;
-        this.node.setAttribute('colspan', this.rowspan);
+        this.node.setAttribute('rowspan', this.rowspan);
     }