TinyMCE 3.5.8 update; some fixes

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / advlink / js / advlink.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
index 9ca955c9288444fade5beb62545346f24cef97be..f013aac1e71f27320598f89d57bd1c936fc6aaaf 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -64,13 +64,14 @@ function init() {
        if (elm != null && elm.nodeName == "A")\r
                action = "update";\r
 \r
-       formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); \r
+       formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true);\r
 \r
        setPopupControlsDisabled(true);\r
 \r
        if (action == "update") {\r
                var href = inst.dom.getAttrib(elm, 'href');\r
                var onclick = inst.dom.getAttrib(elm, 'onclick');\r
+               var linkTarget = inst.dom.getAttrib(elm, 'target') ? inst.dom.getAttrib(elm, 'target') : "_self";\r
 \r
                // Setup form data\r
                setFormValue('href', href);\r
@@ -98,7 +99,7 @@ function init() {
                setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));\r
                setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));\r
                setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));\r
-               setFormValue('target', inst.dom.getAttrib(elm, 'target'));\r
+               setFormValue('target', linkTarget);\r
                setFormValue('classes', inst.dom.getAttrib(elm, 'class'));\r
 \r
                // Parse onclick data\r
@@ -119,7 +120,7 @@ function init() {
                addClassesToList('classlist', 'advlink_styles');\r
 \r
                selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);\r
-               selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);\r
+               selectByValue(formObj, 'targetlist', linkTarget, true);\r
        } else\r
                addClassesToList('classlist', 'advlink_styles');\r
 }\r
@@ -377,6 +378,9 @@ function getAnchorListHTML(id, target) {
        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
+               if ((name = nodes[i].id) != "" && !nodes[i].href)\r
+                       html += '<option value="#' + name + '">' + name + '</option>';\r
        }\r
 \r
        if (html == "")\r