Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-02 13:41:24 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE: add Ctrl+K, the "de-facto standard" shortcut to open wpLink, fixes #27305

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@27449


git-svn-id: http://core.svn.wordpress.org/trunk@27295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-03-07 03:09:14 +00:00
parent d3d1014d33
commit 2b697a3d84
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -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' );

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
wp-includes/js/tinymce/plugins/wplink/plugin.js
View File

@ -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 );
});
}
});

2
wp-includes/js/tinymce/plugins/wplink/plugin.min.js vendored
View File

@ -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})});
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})});

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.