diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
| commit | 12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89 (patch) | |
| tree | 49e5e7dd30e1b1263fa5a9c9921b4a59758d94bd /library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js | |
| parent | 3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519 (diff) | |
| parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
| download | volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.gz volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.bz2 volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js')
| -rw-r--r-- | library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js index d6f329059..02ecf22c8 100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js @@ -137,7 +137,7 @@ function updateAction() { do {
if (cell == tdElm)
break;
- col += cell.getAttribute("colspan");
+ col += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
} while ((cell = nextCell(cell)) != null);
for (var i=0; i<rows.length; i++) {
@@ -152,7 +152,7 @@ function updateAction() { cell = updateCell(cell, true);
break;
}
- curr += cell.getAttribute("colspan");
+ curr += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
} while ((cell = nextCell(cell)) != null);
}
|