Upgrade TinyMCE to v3.4.5

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

diff --git a/webcit/tiny_mce/plugins/advlink/js/advlink.js b/webcit/tiny_mce/plugins/advlink/js/advlink.js
index b78e82f76bca113193546ea8bc142c4c62528a35..837c937c6606f8476b66cfa21e6fd8e509fc0c7c 100644 (file)
--- a/webcit/tiny_mce/plugins/advlink/js/advlink.js
+++ b/webcit/tiny_mce/plugins/advlink/js/advlink.js
@@ -30,8 +30,6 @@ function init() {
 \r
        document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');\r
        document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');\r
-       document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');\r
-       document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');\r
        document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');\r
 \r
        // Link list\r
@@ -41,6 +39,13 @@ function init() {
        else\r
                document.getElementById("linklisthrefcontainer").innerHTML = html;\r
 \r
+       // Anchor list\r
+       html = getAnchorListHTML('anchorlist','href');\r
+       if (html == "")\r
+               document.getElementById("anchorlistrow").style.display = 'none';\r
+       else\r
+               document.getElementById("anchorlistcontainer").innerHTML = html;\r
+\r
        // Resize some elements\r
        if (isVisible('hrefbrowser'))\r
                document.getElementById('href').style.width = '260px';\r
@@ -360,20 +365,22 @@ function setAttrib(elm, attrib, value) {
 }\r
 \r
 function getAnchorListHTML(id, target) {\r
-       var inst = tinyMCEPopup.editor;\r
-       var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;\r
-       var html = "";\r
-\r
-       html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';\r
-       html += 'this.options[this.selectedIndex].value;">';\r
-       html += '<option value="">---</option>';\r
+       var ed = tinyMCEPopup.editor, nodes = ed.dom.select('a'), name, i, len, html = "";\r
 \r
-       for (i=0; i<nodes.length; i++) {\r
-               if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")\r
+       for (i=0, len=nodes.length; i<len; i++) {\r
+               if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")\r
                        html += '<option value="#' + name + '">' + name + '</option>';\r
        }\r
 \r
-       html += '</select>';\r
+       if (html == "")\r
+               return "";\r
+\r
+       html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'\r
+               + ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'\r
+               + '>'\r
+               + '<option value="">---</option>'\r
+               + html\r
+               + '</select>';\r
 \r
        return html;\r
 }\r
@@ -389,7 +396,6 @@ function insertAction() {
 \r
        // Remove element if there is no href\r
        if (!document.forms[0].href.value) {\r
-               tinyMCEPopup.execCommand("mceBeginUndoLevel");\r
                i = inst.selection.getBookmark();\r
                inst.dom.remove(elm, 1);\r
                inst.selection.moveToBookmark(i);\r
@@ -398,12 +404,10 @@ function insertAction() {
                return;\r
        }\r
 \r
-       tinyMCEPopup.execCommand("mceBeginUndoLevel");\r
-\r
        // Create new anchor elements\r
        if (elm == null) {\r
                inst.getDoc().execCommand("unlink", false, null);\r
-               tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});\r
+               tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});\r
 \r
                elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});\r
                for (i=0; i<elementArray.length; i++)\r
@@ -425,7 +429,7 @@ function insertAction() {
 \r
 function setAllAttribs(elm) {\r
        var formObj = document.forms[0];\r
-       var href = formObj.href.value;\r
+       var href = formObj.href.value.replace(/ /g, '%20');\r
        var target = getSelectValue(formObj, 'targetlist');\r
 \r
        setAttrib(elm, 'href', href);\r