Upgrade TinyMCE

[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..f67a5bc82810d5cd57d3b6a05fdf4bee9e199b2c 100644 (file)
--- a/webcit/tiny_mce/themes/advanced/js/link.js
+++ b/webcit/tiny_mce/themes/advanced/js/link.js
@@ -53,6 +53,7 @@ var LinkDialog = {
 \r
                // Create new anchor elements\r
                if (e == null) {\r
+                       ed.getDoc().execCommand("unlink", false, null);\r
                        tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});\r
 \r
                        tinymce.each(ed.dom.select("a"), function(n) {\r
@@ -62,8 +63,8 @@ var LinkDialog = {
                                        ed.dom.setAttribs(e, {\r
                                                href : f.href.value,\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
@@ -71,8 +72,8 @@ var LinkDialog = {
                        ed.dom.setAttribs(e, {\r
                                href : f.href.value,\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 +93,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