diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index fd723cd361..5ab3910bcc 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -1449,7 +1449,7 @@ final class _WP_Editors {
-
+
diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 8dacc92388..48628005c8 100644
--- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
@@ -5,14 +5,13 @@ tinymce.PluginManager.add( 'wplink', function( editor ) {
});
// 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]'
});
@@ -26,7 +25,6 @@ tinymce.PluginManager.add( 'wplink', function( editor ) {
editor.addMenuItem( 'link', {
icon: 'link',
text: 'Insert link',
- shortcut: 'Alt+Shift+A',
cmd: 'WP_Link',
stateSelector: 'a[href]',
context: 'insert',
diff --git a/src/wp-includes/js/wplink.js b/src/wp-includes/js/wplink.js
index 0033377c71..4a39b76285 100644
--- a/src/wp-includes/js/wplink.js
+++ b/src/wp-includes/js/wplink.js
@@ -161,11 +161,7 @@ var wpLink;
// Focus the URL field and highlight its contents.
// 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();
}
// Load the most recent results if this is the first time opening the panel.