summaryrefslogtreecommitdiff
path: root/program/js/tiny_mce/plugins/table/jscripts/merge_cells.js
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2006-11-08 02:23:06 +0000
committersvncommit <devs@roundcube.net>2006-11-08 02:23:06 +0000
commitf0ea59bc8873461e060032f69d46032a97b68331 (patch)
tree638cca14ba4d6b052ae38d33426a19ceac4cb042 /program/js/tiny_mce/plugins/table/jscripts/merge_cells.js
parent5c52d06844779efbf4034663f5e68db10619b367 (diff)
upgrade to TinyMCE v2.0.8
Diffstat (limited to 'program/js/tiny_mce/plugins/table/jscripts/merge_cells.js')
-rw-r--r--program/js/tiny_mce/plugins/table/jscripts/merge_cells.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/js/tiny_mce/plugins/table/jscripts/merge_cells.js b/program/js/tiny_mce/plugins/table/jscripts/merge_cells.js
index 51a274962..06cbb275d 100644
--- a/program/js/tiny_mce/plugins/table/jscripts/merge_cells.js
+++ b/program/js/tiny_mce/plugins/table/jscripts/merge_cells.js
@@ -11,6 +11,11 @@ function mergeCells() {
var args = new Array();
var formObj = document.forms[0];
+ if (!AutoValidator.validate(formObj)) {
+ alert(tinyMCE.getLang('lang_invalid_data'));
+ return false;
+ }
+
args["numcols"] = formObj.numcols.value;
args["numrows"] = formObj.numrows.value;