projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempt to work out col widhts that dont have them.
[roojs1]
/
Roo
/
htmleditor
/
BlockTd.js
diff --git
a/Roo/htmleditor/BlockTd.js
b/Roo/htmleditor/BlockTd.js
index
6bda2c3
..
a8a2454
100644
(file)
--- a/
Roo/htmleditor/BlockTd.js
+++ b/
Roo/htmleditor/BlockTd.js
@@
-614,7
+614,13
@@
Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
if (this.colWidths[0] != false && table[r][c].colspan > 1) {
var el = Roo.htmleditor.Block.factory(table[r][c].cell);
var width = 0;
if (this.colWidths[0] != false && table[r][c].colspan > 1) {
var el = Roo.htmleditor.Block.factory(table[r][c].cell);
var width = 0;
+ var lv = false;
for(var i = 0; i < table[r][c].colspan; i ++) {
for(var i = 0; i < table[r][c].colspan; i ++) {
+ if (typeof(this.colWidths[c + i]) != 'undefined') {
+ lv = this.colWidths[c + i];
+ } else {
+ this.colWidths[c + i] = lv;
+ }
width += Math.floor(this.colWidths[c + i]);
}
el.width = width +'%';
width += Math.floor(this.colWidths[c + i]);
}
el.width = width +'%';