Imported Upstream version 0.5

[roundcube.git] / program / js / tiny_mce / plugins / table / js / table.js

diff --git a/program/js/tiny_mce/plugins/table/js/table.js b/program/js/tiny_mce/plugins/table/js/table.js
index 2b6fd1f7020a896ce8717921e5d88111c367a0cb..d1b42c2af0dc43596c3576f0499253337d3ede14 100644 (file)
--- a/program/js/tiny_mce/plugins/table/js/table.js
+++ b/program/js/tiny_mce/plugins/table/js/table.js
@@ -24,14 +24,14 @@ function insertTable() {
        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 = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;\r
-       frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value;\r
-       rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value;\r
+       align = getSelectValue(formObj, "align");\r
+       frame = getSelectValue(formObj, "tframe");\r
+       rules = getSelectValue(formObj, "rules");\r
        width = formObj.elements['width'].value;\r
        height = formObj.elements['height'].value;\r
        bordercolor = formObj.elements['bordercolor'].value;\r
        bgcolor = formObj.elements['bgcolor'].value;\r
-       className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;\r
+       className = getSelectValue(formObj, "class");\r
        id = formObj.elements['id'].value;\r
        summary = formObj.elements['summary'].value;\r
        style = formObj.elements['style'].value;\r
@@ -82,7 +82,7 @@ function insertTable() {
                        capEl = elm.ownerDocument.createElement('caption');\r
 \r
                        if (!tinymce.isIE)\r
-                               capEl.innerHTML = '<br mce_bogus="1"/>';\r
+                               capEl.innerHTML = '<br _mce_bogus="1"/>';\r
 \r
                        elm.insertBefore(capEl, elm.firstChild);\r
                }\r
@@ -151,13 +151,14 @@ function insertTable() {
        html += makeAttrib('border', border);\r
        html += makeAttrib('cellpadding', cellpadding);\r
        html += makeAttrib('cellspacing', cellspacing);\r
+       html += makeAttrib('_mce_new', '1');\r
 \r
        if (width && inst.settings.inline_styles) {\r
                if (style)\r
                        style += '; ';\r
 \r
                // Force px\r
-               if (/[0-9\.]+/.test(width))\r
+               if (/^[0-9\.]+$/.test(width))\r
                        width += 'px';\r
 \r
                style += 'width: ' + width;\r
@@ -186,7 +187,7 @@ function insertTable() {
 \r
        if (caption) {\r
                if (!tinymce.isIE)\r
-                       html += '<caption><br mce_bogus="1"/></caption>';\r
+                       html += '<caption><br _mce_bogus="1"/></caption>';\r
                else\r
                        html += '<caption></caption>';\r
        }\r
@@ -196,7 +197,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 _mce_bogus="1"/></td>';\r
                        else\r
                                html += '<td></td>';\r
                }\r
@@ -210,9 +211,10 @@ function insertTable() {
 \r
        // Move table\r
        if (inst.settings.fix_table_elements) {\r
-               var bm = inst.selection.getBookmark(), patt = '';\r
+               var patt = '';\r
 \r
-               inst.execCommand('mceInsertContent', false, '<br class="_mce_marker" />');\r
+               inst.focus();\r
+               inst.selection.setContent('<br class="_mce_marker" />');\r
 \r
                tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {\r
                        if (patt)\r
@@ -225,12 +227,19 @@ function insertTable() {
                        inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);\r
                });\r
 \r
-               dom.setOuterHTML(dom.select('._mce_marker')[0], html);\r
-\r
-               inst.selection.moveToBookmark(bm);\r
+               dom.setOuterHTML(dom.select('br._mce_marker')[0], html);\r
        } 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
+\r
+               inst.selection.select(td[0], true);\r
+               inst.selection.collapse();\r
+\r
+               dom.setAttrib(node, '_mce_new', '');\r
+       });\r
+\r
        inst.addVisual();\r
        inst.execCommand('mceEndUndoLevel');\r
 \r
@@ -307,7 +316,7 @@ function init() {
                style = dom.serializeStyle(st);\r
                dir = dom.getAttrib(elm, 'dir');\r
                lang = dom.getAttrib(elm, 'lang');\r
-               background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");\r
+               background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");\r
                formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;\r
 \r
                orgTableWidth = width;\r
@@ -322,7 +331,7 @@ function init() {
 \r
        // Update form\r
        selectByValue(formObj, 'align', align);\r
-       selectByValue(formObj, 'frame', frame);\r
+       selectByValue(formObj, 'tframe', frame);\r
        selectByValue(formObj, 'rules', rules);\r
        selectByValue(formObj, 'class', className, true, true);\r
        formObj.cols.value = cols;\r
@@ -416,7 +425,7 @@ function changedStyle() {
        var st = dom.parseStyle(formObj.style.value);\r
 \r
        if (st['background-image'])\r
-               formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");\r
+               formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");\r
        else\r
                formObj.backgroundimage.value = '';\r
 \r