aboutsummaryrefslogtreecommitdiffstats
path: root/library/tinymce/jscripts/tiny_mce/plugins/table
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-15 17:18:46 -0700
committerfriendica <info@friendica.com>2012-05-15 17:18:46 -0700
commite39014a3a765f7afb189be5409b60a771f5c46da (patch)
tree418391375830247eac3da1eadb5a6993a76b7977 /library/tinymce/jscripts/tiny_mce/plugins/table
parent205c09e4f0ffd47f91b205c5289633ebb1007f27 (diff)
downloadvolse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.tar.gz
volse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.tar.bz2
volse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.zip
update tinymce to 3.5.0.1
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/table')
-rw-r--r--library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js4
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);
}