diff options
| author | zottel <github@zottel.net> | 2012-05-17 01:24:37 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-17 01:24:37 +0200 |
| commit | 764ac240a9a9ffb7c855a69bc2f81e9d314a617f (patch) | |
| tree | 2d9555171267adc0c624ff52c33adb9103c4ef48 /library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js | |
| parent | e9aeafbe13fc8b6371914ecbff67a19769b84bb5 (diff) | |
| parent | f5f345d388c9f1f0a47bad75c933d1bfe723773d (diff) | |
| download | volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.tar.gz volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.tar.bz2 volse-hubzilla-764ac240a9a9ffb7c855a69bc2f81e9d314a617f.zip | |
Merge remote branch 'upstream/master'
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);
}
|