Upgrade TinyMCE to v3.4.5

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

diff --git a/webcit/tiny_mce/plugins/table/js/row.js b/webcit/tiny_mce/plugins/table/js/row.js
index 70d95b6729d78b16c9934f8fac9462e9bddb6aec..a13d69592d5af7467eee68259b930ab110975ed8 100644 (file)
--- a/webcit/tiny_mce/plugins/table/js/row.js
+++ b/webcit/tiny_mce/plugins/table/js/row.js
@@ -56,6 +56,11 @@ function updateAction() {
        var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];\r
        var action = getSelectValue(formObj, 'action');\r
 \r
+       if (!AutoValidator.validate(formObj)) {\r
+               tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');\r
+               return false;\r
+       }\r
+\r
        tinyMCEPopup.restoreSelection();\r
        trElm = dom.getParent(inst.selection.getStart(), "tr");\r
        tableElm = dom.getParent(inst.selection.getStart(), "table");\r
@@ -80,8 +85,6 @@ function updateAction() {
                return;\r
        }\r
 \r
-       inst.execCommand('mceBeginUndoLevel');\r
-\r
        switch (action) {\r
                case "row":\r
                        updateRow(trElm);\r
@@ -123,19 +126,19 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 \r
        // Update row element\r
        if (!skip_id)\r
-               tr_elm.setAttribute('id', formObj.id.value);\r
+               dom.setAttrib(tr_elm, 'id', formObj.id.value);\r
 \r
-       tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));\r
-       tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));\r
-       tr_elm.setAttribute('lang', formObj.lang.value);\r
-       tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));\r
-       tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));\r
+       dom.setAttrib(tr_elm, 'align', getSelectValue(formObj, 'align'));\r
+       dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));\r
+       dom.setAttrib(tr_elm, 'lang', formObj.lang.value);\r
+       dom.setAttrib(tr_elm, 'dir', getSelectValue(formObj, 'dir'));\r
+       dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));\r
        dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));\r
 \r
        // Clear deprecated attributes\r
-       tr_elm.setAttribute('background', '');\r
-       tr_elm.setAttribute('bgColor', '');\r
-       tr_elm.setAttribute('height', '');\r
+       dom.setAttrib(tr_elm, 'background', '');\r
+       dom.setAttrib(tr_elm, 'bgColor', '');\r
+       dom.setAttrib(tr_elm, 'height', '');\r
 \r
        // Set styles\r
        tr_elm.style.height = getCSSSize(formObj.height.value);\r
@@ -163,13 +166,10 @@ function updateRow(tr_elm, skip_id, skip_parent) {
                if (newParent == null) {\r
                        newParent = doc.createElement(dest);\r
 \r
-                       if (dest == "thead") {\r
-                               if (theTable.firstChild.nodeName == 'CAPTION')\r
-                                       inst.dom.insertAfter(newParent, theTable.firstChild);\r
-                               else\r
-                                       theTable.insertBefore(newParent, theTable.firstChild);\r
-                       } else\r
-                               theTable.appendChild(newParent);\r
+                       if (theTable.firstChild.nodeName == 'CAPTION')\r
+                               inst.dom.insertAfter(newParent, theTable.firstChild);\r
+                       else\r
+                               theTable.insertBefore(newParent, theTable.firstChild);\r
                }\r
 \r
                // append the row to the new parent\r