From 2b697a3d84ebdea65f4ce58e91fbf059c5f18584 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 7 Mar 2014 03:09:14 +0000 Subject: [PATCH] TinyMCE: add Ctrl+K, the "de-facto standard" shortcut to open wpLink, fixes #27305 Built from https://develop.svn.wordpress.org/trunk@27449 git-svn-id: http://core.svn.wordpress.org/trunk@27295 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wordpress/plugin.js | 1 - .../tinymce/plugins/wordpress/plugin.min.js | 2 +- .../js/tinymce/plugins/wplink/plugin.js | 15 +++++++++++---- .../js/tinymce/plugins/wplink/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 120891 -> 120908 bytes 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 15c1abdb65..ab5d2e03f9 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -420,7 +420,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { editor.addShortcut( modKey + '+u', '', 'InsertUnorderedList' ); editor.addShortcut( modKey + '+o', '', 'InsertOrderedList' ); editor.addShortcut( modKey + '+n', '', 'mceSpellCheck' ); - editor.addShortcut( modKey + '+a', '', 'WP_Link' ); editor.addShortcut( modKey + '+s', '', 'unlink' ); editor.addShortcut( modKey + '+m', '', 'WP_Medialib' ); editor.addShortcut( modKey + '+z', '', 'WP_Adv' ); diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js index b9e0195059..7fd66fb14d 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f),"hide"===b?(setUserSetting("hidetb","1"),g&&g.active(!1)):(setUserSetting("hidetb","0"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"1"===getUserSetting("hidetb","1")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.on("PreProcess",function(b){var c;b.save&&(c=a.dom.select("img.wp-more-tag",b.node),c.length&&tinymce.each(c,function(b){var c,d=b.parentNode;"P"===d.nodeName&&d.childNodes.length>1&&(c=a.dom.create("p"),d.parentNode.insertBefore(c,d),c.appendChild(b))}))}),a.addCommand("WP_More",function(b){var c,d,e,f,g,h="wp-more-tag",i=tinymce.Env.ie?"":'
',j=a.dom,k=a.selection.getNode();return b=b||"more",h+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===k.nodeName?void a.insertContent("

"+d+"

"):(c=j.getParent(k,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&(f=j.create("p",null,d),j.insertAfter(f,c),(g=f.nextSibling)||(g=j.create("p",null,i),j.insertAfter(g,f)),a.nodeChanged(),a.selection.setCursorLocation(g,0))))}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b,c,d=tinymce.Env,e=0,f=["mceContentBody"],g=a.getDoc();"rtl"===a.getParam("directionality")&&f.push("rtl"),d.ie&&(9===parseInt(d.ie,10)?f.push("ie9"):8===parseInt(d.ie,10)?f.push("ie8"):d.ie<8&&f.push("ie7")),f.push("wp-editor"),tinymce.each(f,function(b){b&&a.dom.addClass(g.body,b)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),"ontouchstart"in window||a.dom.bind(g,"onwheel"in g?"wheel":"mousewheel",function(f){var h,i,j=g.documentElement;a.settings.wp_fullscreen||("function"!=typeof g.hasFocus||g.hasFocus())&&("undefined"!=typeof f.deltaY?(h=f.deltaY,"undefined"!=typeof f.deltaMode&&f.deltaMode===f.DOM_DELTA_LINE&&(h*=20)):h=-f.wheelDelta,d.webkit?g.body.scrollTop+=h:j.scrollTop+=h,i=j.scrollTop||g.body.scrollTop,b===i?(e+=h,window.clearTimeout(c),c=window.setTimeout(function(){e=0},1e3)):e=0,b=i,e>1e3||-1e3>e||f.preventDefault())})}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g,"

 

"),void(a.getParam("wpautop",!0)&&"undefined"!=typeof switchEditors&&(b.content=switchEditors.pre_wpautop(b.content))))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b")}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+a","","WP_Link"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()}),a.dom.bind(a.getWin(),"dragover",function(b){"undefined"!=typeof window.jQuery&&jQuery(a.getContainer()).trigger(b)})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file +tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f),"hide"===b?(setUserSetting("hidetb","1"),g&&g.active(!1)):(setUserSetting("hidetb","0"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"1"===getUserSetting("hidetb","1")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.on("PreProcess",function(b){var c;b.save&&(c=a.dom.select("img.wp-more-tag",b.node),c.length&&tinymce.each(c,function(b){var c,d=b.parentNode;"P"===d.nodeName&&d.childNodes.length>1&&(c=a.dom.create("p"),d.parentNode.insertBefore(c,d),c.appendChild(b))}))}),a.addCommand("WP_More",function(b){var c,d,e,f,g,h="wp-more-tag",i=tinymce.Env.ie?"":'
',j=a.dom,k=a.selection.getNode();return b=b||"more",h+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===k.nodeName?void a.insertContent("

"+d+"

"):(c=j.getParent(k,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&(f=j.create("p",null,d),j.insertAfter(f,c),(g=f.nextSibling)||(g=j.create("p",null,i),j.insertAfter(g,f)),a.nodeChanged(),a.selection.setCursorLocation(g,0))))}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b,c,d=tinymce.Env,e=0,f=["mceContentBody"],g=a.getDoc();"rtl"===a.getParam("directionality")&&f.push("rtl"),d.ie&&(9===parseInt(d.ie,10)?f.push("ie9"):8===parseInt(d.ie,10)?f.push("ie8"):d.ie<8&&f.push("ie7")),f.push("wp-editor"),tinymce.each(f,function(b){b&&a.dom.addClass(g.body,b)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),"ontouchstart"in window||a.dom.bind(g,"onwheel"in g?"wheel":"mousewheel",function(f){var h,i,j=g.documentElement;a.settings.wp_fullscreen||("function"!=typeof g.hasFocus||g.hasFocus())&&("undefined"!=typeof f.deltaY?(h=f.deltaY,"undefined"!=typeof f.deltaMode&&f.deltaMode===f.DOM_DELTA_LINE&&(h*=20)):h=-f.wheelDelta,d.webkit?g.body.scrollTop+=h:j.scrollTop+=h,i=j.scrollTop||g.body.scrollTop,b===i?(e+=h,window.clearTimeout(c),c=window.setTimeout(function(){e=0},1e3)):e=0,b=i,e>1e3||-1e3>e||f.preventDefault())})}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g,"

 

"),void(a.getParam("wpautop",!0)&&"undefined"!=typeof switchEditors&&(b.content=switchEditors.pre_wpautop(b.content))))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b")}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()}),a.dom.bind(a.getWin(),"dragover",function(b){"undefined"!=typeof window.jQuery&&jQuery(a.getContainer()).trigger(b)})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js index 4129950ffc..ce23641643 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -1,12 +1,19 @@ /* global tinymce */ tinymce.PluginManager.add( 'wplink', function( editor ) { + var linkButton; + // Register a command so that it can be invoked by using tinyMCE.activeEditor.execCommand( 'WP_Link' ); editor.addCommand( 'WP_Link', function() { - if ( typeof window.wpLink !== 'undefined' ) { + if ( ( ! linkButton || ! linkButton.disabled() ) && typeof window.wpLink !== 'undefined' ) { window.wpLink.open( editor.id ); } }); + // WP default shortcut + editor.addShortcut( 'alt+shift+a', '', 'WP_Link' ); + // The "de-facto standard" shortcut, see #27305 + editor.addShortcut( 'ctrl+k', '', 'WP_Link' ); + editor.addButton( 'link', { icon: 'link', tooltip: 'Insert/edit link', @@ -14,13 +21,13 @@ tinymce.PluginManager.add( 'wplink', function( editor ) { cmd: 'WP_Link', onPostRender: function() { - var ctrl = this; + linkButton = this; editor.on( 'nodechange', function( event ) { var node = event.element; - ctrl.disabled( editor.selection.isCollapsed() && node.nodeName !== 'A' ); - ctrl.active( node.nodeName === 'A' && ! node.name ); + linkButton.disabled( editor.selection.isCollapsed() && node.nodeName !== 'A' ); + linkButton.active( node.nodeName === 'A' && ! node.name ); }); } }); diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js index b0baf545c0..54e898e9a8 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wplink",function(a){a.addCommand("WP_Link",function(){"undefined"!=typeof window.wpLink&&window.wpLink.open(a.id)}),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){var b=this;a.on("nodechange",function(c){var d=c.element;b.disabled(a.selection.isCollapsed()&&"A"!==d.nodeName),b.active("A"===d.nodeName&&!d.name)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})}); \ No newline at end of file +tinymce.PluginManager.add("wplink",function(a){var b;a.addCommand("WP_Link",function(){b&&b.disabled()||"undefined"==typeof window.wpLink||window.wpLink.open(a.id)}),a.addShortcut("alt+shift+a","","WP_Link"),a.addShortcut("ctrl+k","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){b=this,a.on("nodechange",function(c){var d=c.element;b.disabled(a.selection.isCollapsed()&&"A"!==d.nodeName),b.active("A"===d.nodeName&&!d.name)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})}); \ 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 d7e7fdfeb6a276f6d2c791ee430be54415e71bbc..51bcfddc917e67c390ed6f4064fac42c9c548ba7 100644 GIT binary patch delta 6165 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 delta 6147 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