Upgrade TinyMCE to v3.4.5

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

diff --git a/webcit/tiny_mce/plugins/table/js/table.js b/webcit/tiny_mce/plugins/table/js/table.js
index cfcdf545c85e80e7b3edbb6cb6270bc7cd35e9ad..520d857fcee05a41563523e7b2836f7708070ede 100644 (file)
--- a/webcit/tiny_mce/plugins/table/js/table.js
+++ b/webcit/tiny_mce/plugins/table/js/table.js
@@ -12,7 +12,7 @@ function insertTable() {
        tinyMCEPopup.restoreSelection();\r
 \r
        if (!AutoValidator.validate(formObj)) {\r
-               tinyMCEPopup.alert(inst.getLang('invalid_data'));\r
+               tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');\r
                return false;\r
        }\r
 \r
@@ -21,7 +21,7 @@ function insertTable() {
        // Get form data\r
        cols = formObj.elements['cols'].value;\r
        rows = formObj.elements['rows'].value;\r
-       border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;\r
+       border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;\r
        cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";\r
        cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";\r
        align = getSelectValue(formObj, "align");\r
@@ -58,8 +58,6 @@ function insertTable() {
 \r
        // Update table\r
        if (action == "update") {\r
-               inst.execCommand('mceBeginUndoLevel');\r
-\r
                dom.setAttrib(elm, 'cellPadding', cellpadding, true);\r
                dom.setAttrib(elm, 'cellSpacing', cellspacing, true);\r
                dom.setAttrib(elm, 'border', border);\r
@@ -82,7 +80,7 @@ function insertTable() {
                        capEl = elm.ownerDocument.createElement('caption');\r
 \r
                        if (!tinymce.isIE)\r
-                               capEl.innerHTML = '<br _mce_bogus="1"/>';\r
+                               capEl.innerHTML = '<br data-mce-bogus="1"/>';\r
 \r
                        elm.insertBefore(capEl, elm.firstChild);\r
                }\r
@@ -151,7 +149,7 @@ function insertTable() {
        html += makeAttrib('border', border);\r
        html += makeAttrib('cellpadding', cellpadding);\r
        html += makeAttrib('cellspacing', cellspacing);\r
-       html += makeAttrib('_mce_new', '1');\r
+       html += makeAttrib('data-mce-new', '1');\r
 \r
        if (width && inst.settings.inline_styles) {\r
                if (style)\r
@@ -187,7 +185,7 @@ function insertTable() {
 \r
        if (caption) {\r
                if (!tinymce.isIE)\r
-                       html += '<caption><br _mce_bogus="1"/></caption>';\r
+                       html += '<caption><br data-mce-bogus="1"/></caption>';\r
                else\r
                        html += '<caption></caption>';\r
        }\r
@@ -197,7 +195,7 @@ function insertTable() {
 \r
                for (var x=0; x<cols; x++) {\r
                        if (!tinymce.isIE)\r
-                               html += '<td><br _mce_bogus="1"/></td>';\r
+                               html += '<td><br data-mce-bogus="1"/></td>';\r
                        else\r
                                html += '<td></td>';\r
                }\r
@@ -207,8 +205,6 @@ function insertTable() {
 \r
        html += "</table>";\r
 \r
-       inst.execCommand('mceBeginUndoLevel');\r
-\r
        // Move table\r
        if (inst.settings.fix_table_elements) {\r
                var patt = '';\r
@@ -231,7 +227,7 @@ function insertTable() {
        } else\r
                inst.execCommand('mceInsertContent', false, html);\r
 \r
-       tinymce.each(dom.select('table[_mce_new]'), function(node) {\r
+       tinymce.each(dom.select('table[data-mce-new]'), function(node) {\r
                var td = dom.select('td', node);\r
 \r
                try {\r
@@ -242,7 +238,7 @@ function insertTable() {
                        // Ignore\r
                }\r
 \r
-               dom.setAttrib(node, '_mce_new', '');\r
+               dom.setAttrib(node, 'data-mce-new', '');\r
        });\r
 \r
        inst.addVisual();\r