From df6e920a8769c0ed70cdf678f56c4a9f74b54c59 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 11 Mar 2015 03:00:15 +0000
Subject: [PATCH] wpLink: change the text label to Link text, always focus the
 URK field, fix Ctrl/Cmd + K shortcut. See #28206.

git-svn-id: https://develop.svn.wordpress.org/trunk@31714 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-editor.php                 | 2 +-
 src/wp-includes/js/tinymce/plugins/wplink/plugin.js | 6 ++----
 src/wp-includes/js/wplink.js                        | 6 +-----
 3 files changed, 4 insertions(+), 10 deletions(-)

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 {
 			<div id="link-options">
 				<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>
 					<label><span><?php _e( 'URL' ); ?></span><input id="wp-link-url" type="text" /></label>
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.