Updated tiny-mce to most recent 3.4 version

[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..0242506a454a40c4be07ea802b2758a0b310860a 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,11 +58,21 @@ 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
+\r
+               if (!isCssSize(border)) {\r
+                       dom.setAttrib(elm, 'border', border);\r
+               } else {\r
+                       dom.setAttrib(elm, 'border', '');\r
+               }\r
+\r
+               if (border == '') {\r
+                       dom.setStyle(elm, 'border-width', '');\r
+                       dom.setStyle(elm, 'border', '');\r
+                       dom.setAttrib(elm, 'border', '');\r
+               }\r
+\r
                dom.setAttrib(elm, 'align', align);\r
                dom.setAttrib(elm, 'frame', frame);\r
                dom.setAttrib(elm, 'rules', rules);\r
@@ -82,7 +92,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
@@ -121,7 +131,7 @@ function insertTable() {
                if (bordercolor != "") {\r
                        elm.style.borderColor = bordercolor;\r
                        elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;\r
-                       elm.style.borderWidth = border == "" ? "1px" : border;\r
+                       elm.style.borderWidth = cssSize(border);\r
                } else\r
                        elm.style.borderColor = '';\r
 \r
@@ -134,7 +144,7 @@ function insertTable() {
                //elm.outerHTML = elm.outerHTML;\r
 \r
                inst.nodeChanged();\r
-               inst.execCommand('mceEndUndoLevel');\r
+               inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});\r
 \r
                // Repaint if dimensions changed\r
                if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)\r
@@ -148,10 +158,13 @@ function insertTable() {
        html += '<table';\r
 \r
        html += makeAttrib('id', id);\r
-       html += makeAttrib('border', border);\r
+       if (!isCssSize(border)) {\r
+               html += makeAttrib('border', border);\r
+       }\r
+\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 +200,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 +210,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 +220,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,22 +242,25 @@ function insertTable() {
        } else\r
                inst.execCommand('mceInsertContent', false, html);\r
 \r
-       tinymce.each(dom.select('table[_mce_new]'), function(node) {\r
-               var td = dom.select('td', node);\r
+       tinymce.each(dom.select('table[data-mce-new]'), function(node) {\r
+               // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document\r
+               if (tinymce.isIE && node.nextSibling == null) {\r
+                       dom.insertAfter(dom.create('p'), node);\r
+               }\r
 \r
+               var tdorth = dom.select('td,th', node);\r
                try {\r
-                       // IE9 might fail to do this selection\r
-                       inst.selection.select(td[0], true);\r
-                       inst.selection.collapse();\r
+                       // IE9 might fail to do this selection \r
+                       inst.selection.setCursorLocation(tdorth[0], 0);\r
                } catch (ex) {\r
                        // Ignore\r
                }\r
 \r
-               dom.setAttrib(node, '_mce_new', '');\r
+               dom.setAttrib(node, 'data-mce-new', '');\r
        });\r
 \r
        inst.addVisual();\r
-       inst.execCommand('mceEndUndoLevel');\r
+       inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});\r
 \r
        tinyMCEPopup.close();\r
 }\r
@@ -388,6 +402,20 @@ function changedSize() {
        formObj.style.value = dom.serializeStyle(st);\r
 }\r
 \r
+function isCssSize(value) {\r
+       return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);\r
+}\r
+\r
+function cssSize(value, def) {\r
+       value = tinymce.trim(value || def);\r
+\r
+       if (!isCssSize(value)) {\r
+               return parseInt(value, 10) + 'px';\r
+       }\r
+\r
+       return value;\r
+}\r
+\r
 function changedBackgroundImage() {\r
        var formObj = document.forms[0];\r
        var st = dom.parseStyle(formObj.style.value);\r
@@ -402,8 +430,14 @@ function changedBorder() {
        var st = dom.parseStyle(formObj.style.value);\r
 \r
        // Update border width if the element has a color\r
-       if (formObj.border.value != "" && formObj.bordercolor.value != "")\r
-               st['border-width'] = formObj.border.value + "px";\r
+       if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))\r
+               st['border-width'] = cssSize(formObj.border.value);\r
+       else {\r
+               if (!formObj.border.value) {\r
+                       st['border'] = '';\r
+                       st['border-width'] = '';\r
+               }\r
+       }\r
 \r
        formObj.style.value = dom.serializeStyle(st);\r
 }\r
@@ -419,7 +453,7 @@ function changedColor() {
 \r
                // Add border-width if it's missing\r
                if (!st['border-width'])\r
-                       st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";\r
+                       st['border-width'] = cssSize(formObj.border.value, 1);\r
        }\r
 \r
        formObj.style.value = dom.serializeStyle(st);\r