Changeset 27449

Timestamp:

03/07/2014 03:09:00 AM (11 years ago)

Author:

azaozz

Message:

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

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wordpress/plugin.js (modified) (1 diff)
• wplink/plugin.js (modified) (2 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

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

trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js

@@ -1 +1 @@
 /* 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', {
@@ -15 +22 @@
 
         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 );
             });
         }