Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / themes / advanced / js / link.js

diff --git a/webcit/tiny_mce/themes/advanced/js/link.js b/webcit/tiny_mce/themes/advanced/js/link.js
index 2974878e1e18c7e1a77545f336bbec847944bba3..53ff409e7962f0d4f2d686922e33eff2ae53714b 100644 (file)
--- a/webcit/tiny_mce/themes/advanced/js/link.js
+++ b/webcit/tiny_mce/themes/advanced/js/link.js
@@ -31,7 +31,7 @@ var LinkDialog = {
        },\r
 \r
        update : function() {\r
-               var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;\r
+               var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');\r
 \r
                tinyMCEPopup.restoreSelection();\r
                e = ed.dom.getParent(ed.selection.getNode(), 'A');\r
@@ -39,7 +39,6 @@ var LinkDialog = {
                // Remove element if there is no href\r
                if (!f.href.value) {\r
                        if (e) {\r
-                               tinyMCEPopup.execCommand("mceBeginUndoLevel");\r
                                b = ed.selection.getBookmark();\r
                                ed.dom.remove(e, 1);\r
                                ed.selection.moveToBookmark(b);\r
@@ -49,30 +48,29 @@ var LinkDialog = {
                        }\r
                }\r
 \r
-               tinyMCEPopup.execCommand("mceBeginUndoLevel");\r
-\r
                // Create new anchor elements\r
                if (e == null) {\r
-                       tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});\r
+                       ed.getDoc().execCommand("unlink", false, null);\r
+                       tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});\r
 \r
                        tinymce.each(ed.dom.select("a"), function(n) {\r
                                if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {\r
                                        e = n;\r
 \r
                                        ed.dom.setAttribs(e, {\r
-                                               href : f.href.value,\r
+                                               href : href,\r
                                                title : f.linktitle.value,\r
-                                               target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,\r
-                                               'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null\r
+                                               target : f.target_list ? getSelectValue(f, "target_list") : null,\r
+                                               'class' : f.class_list ? getSelectValue(f, "class_list") : null\r
                                        });\r
                                }\r
                        });\r
                } else {\r
                        ed.dom.setAttribs(e, {\r
-                               href : f.href.value,\r
+                               href : href,\r
                                title : f.linktitle.value,\r
-                               target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,\r
-                               'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null\r
+                               target : f.target_list ? getSelectValue(f, "target_list") : null,\r
+                               'class' : f.class_list ? getSelectValue(f, "class_list") : null\r
                        });\r
                }\r
 \r
@@ -92,7 +90,7 @@ var LinkDialog = {
                if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))\r
                        n.value = 'mailto:' + n.value;\r
 \r
-               if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))\r
+               if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))\r
                        n.value = 'http://' + n.value;\r
        },\r
 \r