diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 4ffd5dc109..302bf60f69 100644
--- a/wp-includes/js/tinymce/plugins/wplink/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wplink/plugin.js
@@ -74,8 +74,8 @@
var $ = window.jQuery;
function getSelectedLink() {
- var href, html
- node = editor.selection.getNode();
+ var href, html,
+ node = editor.selection.getNode(),
link = editor.dom.getParent( node, 'a[href]' );
if ( ! link ) {
@@ -97,7 +97,7 @@
return link;
}
-
+
function removePlaceholders() {
editor.$( 'a' ).each( function( i, element ) {
var $element = editor.$( element );
@@ -109,7 +109,7 @@
}
});
}
-
+
function removePlaceholderStrings( content, dataAttr ) {
if ( dataAttr ) {
content = content.replace( / data-wp-link-edit="true"/g, '' );
@@ -236,12 +236,12 @@
}
}
} );
-
+
// Remove any remaining placeholders on saving.
editor.on( 'savecontent', function( event ) {
event.content = removePlaceholderStrings( event.content, true );
});
-
+
// Prevent adding undo levels on inserting link placeholder.
editor.on( 'BeforeAddUndo', function( event ) {
if ( event.level.content ) {
diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
index 28b00dcb8c..ce878f0172 100644
--- a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
+++ b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
@@ -1 +1 @@
-!function(a){a.ui.WPLinkPreview=a.ui.Control.extend({url:"#",renderHtml:function(){return'"},setURL:function(b){var c,d;this.url!==b&&(this.url=b,b=window.decodeURIComponent(b),b=b.replace(/^(?:https?:)?\/\/(?:www\.)?/,""),-1!==(c=b.indexOf("?"))&&(b=b.slice(0,c)),-1!==(c=b.indexOf("#"))&&(b=b.slice(0,c)),b=b.replace(/(?:index)?\.html$/,""),"/"===b.charAt(b.length-1)&&(b=b.slice(0,-1)),""===b&&(b=this.url),b.length>40&&-1!==(c=b.indexOf("/"))&&-1!==(d=b.lastIndexOf("/"))&&d!==c&&(c+b.length-d<40&&(d=-(40-(c+1))),b=b.slice(0,c+1)+"\u2026"+b.slice(d)),a.$(this.getEl().firstChild).attr("href",this.url).text(b))}}),a.ui.WPLinkInput=a.ui.Control.extend({renderHtml:function(){return''},setURL:function(a){this.getEl().firstChild.value=a}}),a.PluginManager.add("wplink",function(b){function c(){var a,c;return node=b.selection.getNode(),link=b.dom.getParent(node,"a[href]"),link||(c=b.selection.getContent({format:"raw"}),c&&-1!==c.indexOf("")&&(a=c.match(/href="([^">]+)"/),a&&a[1]&&(link=b.$('a[href="'+a[1]+'"]',node)[0]),link&&(b.selection.select(link),b.nodeChanged()))),link}function d(){b.$("a").each(function(a,c){var d=b.$(c);"_wp_link_placeholder"===d.attr("href")?b.dom.remove(c,!0):d.attr("data-wp-link-edit")&&d.attr("data-wp-link-edit",null)})}function e(a,b){return b&&(a=a.replace(/ data-wp-link-edit="true"/g,"")),a.replace(/]*?href="_wp_link_placeholder"[^>]*>([\s\S]+)<\/a>/g,"$1")}var f,g,h,i,j,k=window.jQuery;b.on("preinit",function(){b.wp&&b.wp._createToolbar&&(g=b.wp._createToolbar(["wp_link_preview","wp_link_edit","wp_link_remove"],!0),h=b.wp._createToolbar(["wp_link_input","wp_link_apply","wp_link_advanced"],!0),h.on("show",function(){var a=h.find("toolbar")[0];a&&a.focus(!0),f=c()}),h.on("hide",function(){h.scrolling||b.execCommand("wp_link_cancel")}))}),b.addCommand("WP_Link",function(){var a=c();a?b.dom.setAttribs(a,{"data-wp-link-edit":!0}):(d(),b.execCommand("mceInsertLink",!1,{href:"_wp_link_placeholder"}),b.selection.select(b.$('a[href="_wp_link_placeholder"]')[0]),b.nodeChanged())}),b.addCommand("wp_link_apply",function(){if(!h.scrolling){var c=a.trim(j.getEl().firstChild.value);if(c&&!/^(?:[a-z]+:|#|\?|\.|\/)/.test(c)&&(c="http://"+c),!c)return void b.dom.remove(f,!0);f&&b.dom.setAttribs(f,{href:c,"data-wp-link-edit":null}),f=!1,b.nodeChanged(),b.focus()}}),b.addCommand("wp_link_cancel",function(){d(),f=!1,b.nodeChanged(),b.focus()}),b.addShortcut("access+a","","WP_Link"),b.addShortcut("meta+k","","WP_Link"),b.addButton("link",{icon:"link",tooltip:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]"}),b.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink"}),b.addMenuItem("link",{icon:"link",text:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0}),b.on("pastepreprocess",function(c){var d=c.content,e=/^(?:https?:)?\/\/\S+$/i;b.selection.isCollapsed()||e.test(b.selection.getContent())||(d=d.replace(/<[^>]+>/g,""),d=a.trim(d),e.test(d)&&(b.execCommand("mceInsertLink",!1,{href:b.dom.decode(d)}),c.preventDefault()))}),b.on("savecontent",function(a){a.content=e(a.content,!0)}),b.on("BeforeAddUndo",function(a){a.level.content&&(a.level.content=e(a.level.content))}),b.addButton("wp_link_preview",{type:"WPLinkPreview",onPostRender:function(){i=this}}),b.addButton("wp_link_input",{type:"WPLinkInput",onPostRender:function(){var c,d,e=this.getEl().firstChild;j=this,k&&k.ui&&k.ui.autocomplete&&(k(e).on("keydown",function(){k(e).removeAttr("aria-activedescendant")}).autocomplete({source:function(a,b){return d===a.term?void b(c):/^https?:/.test(a.term)||-1!==a.term.indexOf(".")?b():(k.post(window.ajaxurl,{action:"wp-link-ajax",page:1,search:a.term,_ajax_linking_nonce:k("#_ajax_linking_nonce").val()},function(a){c=a,b(a)},"json"),void(d=a.term))},focus:function(a,b){k(e).attr("aria-activedescendant","mce-wp-autocomplete-"+b.item.ID)},select:function(a,b){return k(e).val(b.item.permalink),!1},open:function(){k(e).attr("aria-expanded","true"),h.blockHide=!0},close:function(){k(e).attr("aria-expanded","false"),h.blockHide=!1},minLength:2,position:{my:"left top+5"}}).autocomplete("instance")._renderItem=function(a,b){return k('').append(""+b.title+' '+b.info+"").appendTo(a)},k(e).attr({role:"combobox","aria-autocomplete":"list","aria-expanded":"false","aria-owns":k(e).autocomplete("widget").attr("id")}).on("focus",function(){k(e).autocomplete("search")}).autocomplete("widget").addClass("mce-wp-autocomplete").attr("role","listbox")),a.$(e).on("keydown",function(a){13===a.keyCode&&b.execCommand("wp_link_apply")})}}),b.on("wptoolbar",function(a){var c,d,e,f=b.dom.getParent(a.element,"a");f&&(c=b.$(f),d=c.attr("href"),e=c.attr("data-wp-link-edit"),"_wp_link_placeholder"===d||e?(j.setURL(e?d:""),a.element=f,a.toolbar=h):d&&!c.find("img").length&&(i.setURL(d),a.element=f,a.toolbar=g))}),b.addButton("wp_link_edit",{tooltip:"Edit ",icon:"dashicon dashicons-edit",cmd:"WP_Link"}),b.addButton("wp_link_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",cmd:"unlink"}),b.addButton("wp_link_advanced",{tooltip:"Advanced",icon:"dashicon dashicons-admin-generic",onclick:function(){"undefined"!=typeof window.wpLink&&(j.getEl().firstChild.value&&b.execCommand("wp_link_apply"),window.wpLink.open(b.id))}}),b.addButton("wp_link_apply",{tooltip:"Apply",icon:"dashicon dashicons-editor-break",cmd:"wp_link_apply",classes:"widget btn primary"})})}(window.tinymce);
\ No newline at end of file
+!function(a){a.ui.WPLinkPreview=a.ui.Control.extend({url:"#",renderHtml:function(){return'"},setURL:function(b){var c,d;this.url!==b&&(this.url=b,b=window.decodeURIComponent(b),b=b.replace(/^(?:https?:)?\/\/(?:www\.)?/,""),-1!==(c=b.indexOf("?"))&&(b=b.slice(0,c)),-1!==(c=b.indexOf("#"))&&(b=b.slice(0,c)),b=b.replace(/(?:index)?\.html$/,""),"/"===b.charAt(b.length-1)&&(b=b.slice(0,-1)),""===b&&(b=this.url),b.length>40&&-1!==(c=b.indexOf("/"))&&-1!==(d=b.lastIndexOf("/"))&&d!==c&&(c+b.length-d<40&&(d=-(40-(c+1))),b=b.slice(0,c+1)+"\u2026"+b.slice(d)),a.$(this.getEl().firstChild).attr("href",this.url).text(b))}}),a.ui.WPLinkInput=a.ui.Control.extend({renderHtml:function(){return''},setURL:function(a){this.getEl().firstChild.value=a}}),a.PluginManager.add("wplink",function(b){function c(){var a,c,d=b.selection.getNode(),e=b.dom.getParent(d,"a[href]");return e||(c=b.selection.getContent({format:"raw"}),c&&-1!==c.indexOf("")&&(a=c.match(/href="([^">]+)"/),a&&a[1]&&(e=b.$('a[href="'+a[1]+'"]',d)[0]),e&&(b.selection.select(e),b.nodeChanged()))),e}function d(){b.$("a").each(function(a,c){var d=b.$(c);"_wp_link_placeholder"===d.attr("href")?b.dom.remove(c,!0):d.attr("data-wp-link-edit")&&d.attr("data-wp-link-edit",null)})}function e(a,b){return b&&(a=a.replace(/ data-wp-link-edit="true"/g,"")),a.replace(/]*?href="_wp_link_placeholder"[^>]*>([\s\S]+)<\/a>/g,"$1")}var f,g,h,i,j,k=window.jQuery;b.on("preinit",function(){b.wp&&b.wp._createToolbar&&(g=b.wp._createToolbar(["wp_link_preview","wp_link_edit","wp_link_remove"],!0),h=b.wp._createToolbar(["wp_link_input","wp_link_apply","wp_link_advanced"],!0),h.on("show",function(){var a=h.find("toolbar")[0];a&&a.focus(!0),f=c()}),h.on("hide",function(){h.scrolling||b.execCommand("wp_link_cancel")}))}),b.addCommand("WP_Link",function(){var a=c();a?b.dom.setAttribs(a,{"data-wp-link-edit":!0}):(d(),b.execCommand("mceInsertLink",!1,{href:"_wp_link_placeholder"}),b.selection.select(b.$('a[href="_wp_link_placeholder"]')[0]),b.nodeChanged())}),b.addCommand("wp_link_apply",function(){if(!h.scrolling){var c=a.trim(j.getEl().firstChild.value);if(c&&!/^(?:[a-z]+:|#|\?|\.|\/)/.test(c)&&(c="http://"+c),!c)return void b.dom.remove(f,!0);f&&b.dom.setAttribs(f,{href:c,"data-wp-link-edit":null}),f=!1,b.nodeChanged(),b.focus()}}),b.addCommand("wp_link_cancel",function(){d(),f=!1,b.nodeChanged(),b.focus()}),b.addShortcut("access+a","","WP_Link"),b.addShortcut("meta+k","","WP_Link"),b.addButton("link",{icon:"link",tooltip:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]"}),b.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink"}),b.addMenuItem("link",{icon:"link",text:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0}),b.on("pastepreprocess",function(c){var d=c.content,e=/^(?:https?:)?\/\/\S+$/i;b.selection.isCollapsed()||e.test(b.selection.getContent())||(d=d.replace(/<[^>]+>/g,""),d=a.trim(d),e.test(d)&&(b.execCommand("mceInsertLink",!1,{href:b.dom.decode(d)}),c.preventDefault()))}),b.on("savecontent",function(a){a.content=e(a.content,!0)}),b.on("BeforeAddUndo",function(a){a.level.content&&(a.level.content=e(a.level.content))}),b.addButton("wp_link_preview",{type:"WPLinkPreview",onPostRender:function(){i=this}}),b.addButton("wp_link_input",{type:"WPLinkInput",onPostRender:function(){var c,d,e=this.getEl().firstChild;j=this,k&&k.ui&&k.ui.autocomplete&&(k(e).on("keydown",function(){k(e).removeAttr("aria-activedescendant")}).autocomplete({source:function(a,b){return d===a.term?void b(c):/^https?:/.test(a.term)||-1!==a.term.indexOf(".")?b():(k.post(window.ajaxurl,{action:"wp-link-ajax",page:1,search:a.term,_ajax_linking_nonce:k("#_ajax_linking_nonce").val()},function(a){c=a,b(a)},"json"),void(d=a.term))},focus:function(a,b){k(e).attr("aria-activedescendant","mce-wp-autocomplete-"+b.item.ID)},select:function(a,b){return k(e).val(b.item.permalink),!1},open:function(){k(e).attr("aria-expanded","true"),h.blockHide=!0},close:function(){k(e).attr("aria-expanded","false"),h.blockHide=!1},minLength:2,position:{my:"left top+5"}}).autocomplete("instance")._renderItem=function(a,b){return k('').append(""+b.title+' '+b.info+"").appendTo(a)},k(e).attr({role:"combobox","aria-autocomplete":"list","aria-expanded":"false","aria-owns":k(e).autocomplete("widget").attr("id")}).on("focus",function(){k(e).autocomplete("search")}).autocomplete("widget").addClass("mce-wp-autocomplete").attr("role","listbox")),a.$(e).on("keydown",function(a){13===a.keyCode&&b.execCommand("wp_link_apply")})}}),b.on("wptoolbar",function(a){var c,d,e,f=b.dom.getParent(a.element,"a");f&&(c=b.$(f),d=c.attr("href"),e=c.attr("data-wp-link-edit"),"_wp_link_placeholder"===d||e?(j.setURL(e?d:""),a.element=f,a.toolbar=h):d&&!c.find("img").length&&(i.setURL(d),a.element=f,a.toolbar=g))}),b.addButton("wp_link_edit",{tooltip:"Edit ",icon:"dashicon dashicons-edit",cmd:"WP_Link"}),b.addButton("wp_link_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",cmd:"unlink"}),b.addButton("wp_link_advanced",{tooltip:"Advanced",icon:"dashicon dashicons-admin-generic",onclick:function(){"undefined"!=typeof window.wpLink&&(j.getEl().firstChild.value&&b.execCommand("wp_link_apply"),window.wpLink.open(b.id))}}),b.addButton("wp_link_apply",{tooltip:"Apply",icon:"dashicon dashicons-editor-break",cmd:"wp_link_apply",classes:"widget btn primary"})})}(window.tinymce);
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index f1ff3f77a9..ad1240b53a 100644
Binary files a/wp-includes/js/tinymce/wp-tinymce.js.gz and b/wp-includes/js/tinymce/wp-tinymce.js.gz differ
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a966aa0856..8e3c2de6d9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.5-alpha-36604';
+$wp_version = '4.5-alpha-36605';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.