Upgrade TinyMCE

[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 a89625014a404d81203c5b429dc191787a4923c8..b78e82f76bca113193546ea8bc142c4c62528a35 100644 (file)
--- a/webcit/tiny_mce/plugins/advlink/js/advlink.js
+++ b/webcit/tiny_mce/plugins/advlink/js/advlink.js
@@ -116,7 +116,7 @@ function checkPrefix(n) {
        if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))\r
                n.value = 'mailto:' + n.value;\r
 \r
-       if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))\r
+       if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))\r
                n.value = 'http://' + n.value;\r
 }\r
 \r
@@ -354,7 +354,7 @@ function setAttrib(elm, attrib, value) {
 \r
        // Clean up the style\r
        if (attrib == 'style')\r
-               value = dom.serializeStyle(dom.parseStyle(value));\r
+               value = dom.serializeStyle(dom.parseStyle(value), 'a');\r
 \r
        dom.setAttrib(elm, attrib, value);\r
 }\r
@@ -402,6 +402,7 @@ function insertAction() {
 \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
 \r
                elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});\r