Wordpress 3.2-scripts

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / themes / advanced / js / link.js

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