Upgrade TinyMCE

[citadel.git] / webcit / tiny_mce / plugins / table / js / merge_cells.js

diff --git a/webcit/tiny_mce/plugins/table/js/merge_cells.js b/webcit/tiny_mce/plugins/table/js/merge_cells.js
index 31d6df0abcb2f70c55f3319912e0dc8507b79021..7ee4bf04015aa90ca0beda962776474f7486165f 100644 (file)
--- a/webcit/tiny_mce/plugins/table/js/merge_cells.js
+++ b/webcit/tiny_mce/plugins/table/js/merge_cells.js
@@ -1,29 +1,27 @@
 tinyMCEPopup.requireLangPack();\r
 \r
-function init() {\r
-       var f = document.forms[0], v;\r
+var MergeCellsDialog = {\r
+       init : function() {\r
+               var f = document.forms[0];\r
 \r
-       tinyMCEPopup.resizeToInnerSize();\r
+               f.numcols.value = tinyMCEPopup.getWindowArg('cols', 1);\r
+               f.numrows.value = tinyMCEPopup.getWindowArg('rows', 1);\r
+       },\r
 \r
-       f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);\r
-       f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);\r
-}\r
+       merge : function() {\r
+               var func, f = document.forms[0];\r
 \r
-function mergeCells() {\r
-       var args = [], f = document.forms[0];\r
+               tinyMCEPopup.restoreSelection();\r
 \r
-       tinyMCEPopup.restoreSelection();\r
+               func = tinyMCEPopup.getWindowArg('onaction');\r
 \r
-       if (!AutoValidator.validate(f)) {\r
-               tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));\r
-               return false;\r
-       }\r
-\r
-       args["numcols"] = f.numcols.value;\r
-       args["numrows"] = f.numrows.value;\r
+               func({\r
+                       cols : f.numcols.value,\r
+                       rows : f.numrows.value\r
+               });\r
 \r
-       tinyMCEPopup.execCommand("mceTableMergeCells", false, args);\r
-       tinyMCEPopup.close();\r
-}\r
+               tinyMCEPopup.close();\r
+       }\r
+};\r
 \r
-tinyMCEPopup.onInit.add(init);\r
+tinyMCEPopup.onInit.add(MergeCellsDialog.init, MergeCellsDialog);\r