projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fae2139
)
Roo/htmleditor/BlockTd.js
author
Alan
<alan@roojs.com>
Thu, 30 Dec 2021 07:12:20 +0000
(15:12 +0800)
committer
Alan
<alan@roojs.com>
Thu, 30 Dec 2021 07:12:20 +0000
(15:12 +0800)
Roo/htmleditor/BlockTd.js
patch
|
blob
|
history
diff --git
a/Roo/htmleditor/BlockTd.js
b/Roo/htmleditor/BlockTd.js
index
a6c4c9e
..
f9a4cc2
100644
(file)
--- a/
Roo/htmleditor/BlockTd.js
+++ b/
Roo/htmleditor/BlockTd.js
@@
-623,7
+623,11
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
for (var i =0;i< table[this.cellData.row].length ; i++) {
var c = table[this.cellData.row][i];
if (c.row != this.cellData.row) {
- table[this.cellData.row][i].rowspan--;
+ c.rowspan--;
+ continue;
+ }
+ if (c.rowspan > 1) {
+ c.rowspan--;
}
}
table.splice(this.cellData.row,1);
@@
-641,7
+645,7
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
}
table[i].splice(this.cellData.col,1);
}
- table.splice(this.cellData.row,1);
+
this.redrawAllCells(table);
}