WordPress 4.4-scripts

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / wplink / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 17d40a23bf0cea78379aedea1552e96f149cb8ac..eef8940c63545e95bb19f380d75857fb1e216a61 100644 (file)
--- a/wp-includes/js/tinymce/plugins/wplink/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wplink/plugin.js
@@ -55,9 +55,9 @@
                });
 
                // WP default shortcut
-               editor.addShortcut( 'Alt+Shift+A', '', 'WP_Link' );
+               editor.addShortcut( 'access+a', '', 'WP_Link' );
                // The "de-facto standard" shortcut, see #27305
-               editor.addShortcut( 'Meta+K', '', 'WP_Link' );
+               editor.addShortcut( 'meta+k', '', 'WP_Link' );
 
                editor.addButton( 'link', {
                        icon: 'link',
@@ -136,11 +136,13 @@
                } );
 
                editor.on( 'preinit', function() {
-                       toolbar = editor.wp._createToolbar( [
-                               'wp_link_preview',
-                               'wp_link_edit',
-                               'wp_link_remove'
-                       ], true );
+                       if ( editor.wp && editor.wp._createToolbar ) {
+                               toolbar = editor.wp._createToolbar( [
+                                       'wp_link_preview',
+                                       'wp_link_edit',
+                                       'wp_link_remove'
+                               ], true );
+                       }
                } );
        } );
 } )( window.tinymce );