Changeset 31714

Timestamp:

03/11/2015 03:00:15 AM (12 years ago)

Author:

azaozz

Message:

wpLink: change the text label to Link text, always focus the URK field, fix Ctrl/Cmd + K shortcut. See #28206.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wplink/plugin.js (modified) (2 diffs)
• js/wplink.js (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -1450 +1450 @@
                                 <p class="howto"><?php _e( 'Enter the destination URL' ); ?></p>
                                 <div class="wp-link-text-field">
-                                        <label><span><?php _e( 'Text' ); ?></span><input id="wp-link-text" type="text" /></label>
+                                        <label><span><?php _e( 'Link text' ); ?></span><input id="wp-link-text" type="text" /></label>
                                 </div>
                                 <div>

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

@@ -6 +6 @@
 
         // WP default shortcut
-        editor.addShortcut( 'alt+shift+a', '', 'WP_Link' );
+        editor.addShortcut( 'Alt+Shift+A', '', 'WP_Link' );
         // The "de-facto standard" shortcut, see #27305
-        editor.addShortcut( 'ctrl+k', '', 'WP_Link' );
+        editor.addShortcut( 'Meta+K', '', 'WP_Link' );
 
         editor.addButton( 'link', {
                 icon: 'link',
                 tooltip: 'Insert/edit link',
-                shortcut: 'Alt+Shift+A',
                 cmd: 'WP_Link',
                 stateSelector: 'a[href]'
@@ -27 +26 @@
                 icon: 'link',
                 text: 'Insert link',
-                shortcut: 'Alt+Shift+A',
                 cmd: 'WP_Link',
                 stateSelector: 'a[href]',

trunk/src/wp-includes/js/wplink.js

@@ -162 +162 @@
                                 // If this is moved above the selection changes,
                                 // IE will show a flashing cursor over the dialog.
-                                if ( inputs.wrap.hasClass( 'has-text-field' ) ) {
-                                        inputs.text.focus();
-                                } else {
-                                        inputs.url.focus()[0].select();
-                                }
+                                inputs.url.focus()[0].select();
                         }