aboutsummaryrefslogtreecommitdiff
path: root/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
diff options
context:
space:
mode:
authoriionly <iionly@gmx.de>2013-02-19 20:15:34 +0100
committeriionly <iionly@gmx.de>2013-02-19 20:15:34 +0100
commit4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (patch)
tree38a3320f982d5343b11ac63cab158053756db952 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
parentd7ca5d846ccf328ec8940950c4e50e8648bab58a (diff)
downloadelgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.gz
elgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.bz2
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js')
-rw-r--r--mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
index d6f329059..02ecf22c8 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
+++ b/mod/tinymce/vendor/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);
}