Changeset 32059

Timestamp:

04/06/2015 10:50:28 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE: fix our shortcuts on Mac, use Ctrl + Opt + letter.
Props iseulde. See #29558.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (8 diffs)

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

@@ -5 +5 @@
 
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
-    var DOM = tinymce.DOM, wpAdvButton, modKey, style,
+    var DOM = tinymce.DOM,
+        each = tinymce.each,
+        __ = editor.editorManager.i18n.translate,
+        wpAdvButton, style,
         last = 0;
 
@@ -30 +33 @@
         }
 
-        tinymce.each( toolbars, function( toolbar, i ) {
+        each( toolbars, function( toolbar, i ) {
             if ( i > 0 ) {
                 if ( state === 'hide' ) {
@@ -92 +95 @@
         if ( e.content ) {
             if ( e.content.indexOf( '<!--more' ) !== -1 ) {
-                title = editor.editorManager.i18n.translate( 'Read more...' );
+                title = __( 'Read more...' );
 
                 e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
@@ -101 +104 @@
 
             if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
-                title = editor.editorManager.i18n.translate( 'Page break' );
+                title = __( 'Page break' );
 
                 e.content = e.content.replace( /<!--nextpage-->/g,
@@ -150 +153 @@
         classname += ' mce-wp-' + tag;
         title = tag === 'more' ? 'Read more...' : 'Next page';
-        title = editor.editorManager.i18n.translate( title );
+        title = __( title );
         html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
             'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="1" />';
@@ -310 +313 @@
         bodyClass.push('wp-editor');
 
-        tinymce.each( bodyClass, function( cls ) {
+        each( bodyClass, function( cls ) {
             if ( cls ) {
                 dom.addClass( doc.body, cls );
@@ -352 +355 @@
             editor.on( 'PastePostProcess', function( event ) {
                 // Remove empty paragraphs
-                tinymce.each( dom.select( 'p', event.node ), function( node ) {
+                each( dom.select( 'p', event.node ), function( node ) {
                     if ( dom.isEmpty( node ) ) {
                         dom.remove( node );
@@ -409 +412 @@
             editor.settings.height = 300;
         }
-    });
-
-    // Add custom shortcuts
-    modKey = 'alt+shift';
-
-    editor.addShortcut( modKey + '+c', '', 'JustifyCenter' );
-    editor.addShortcut( modKey + '+r', '', 'JustifyRight' );
-    editor.addShortcut( modKey + '+l', '', 'JustifyLeft' );
-    editor.addShortcut( modKey + '+j', '', 'JustifyFull' );
-    editor.addShortcut( modKey + '+q', '', 'mceBlockQuote' );
-    editor.addShortcut( modKey + '+u', '', 'InsertUnorderedList' );
-    editor.addShortcut( modKey + '+o', '', 'InsertOrderedList' );
-    editor.addShortcut( modKey + '+n', '', 'mceSpellCheck' );
-    editor.addShortcut( modKey + '+s', '', 'unlink' );
-    editor.addShortcut( modKey + '+m', '', 'WP_Medialib' );
-    editor.addShortcut( modKey + '+z', '', 'WP_Adv' );
-    editor.addShortcut( modKey + '+t', '', 'WP_More' );
-    editor.addShortcut( modKey + '+d', '', 'Strikethrough' );
-    editor.addShortcut( modKey + '+h', '', 'WP_Help' );
-    editor.addShortcut( modKey + '+p', '', 'WP_Page' );
-    editor.addShortcut( modKey + '+x', '', 'WP_Code' );
-    editor.addShortcut( 'ctrl+s', '', function() {
-        if ( typeof wp !== 'undefined' && wp.autosave ) {
-            wp.autosave.server.triggerSave();
-        }
-    });
-    
+
+        each( {
+            c: 'JustifyCenter',
+            r: 'JustifyRight',
+            l: 'JustifyLeft',
+            j: 'JustifyFull',
+            q: 'mceBlockQuote',
+            u: 'InsertUnorderedList',
+            o: 'InsertOrderedList',
+            s: 'unlink',
+            m: 'WP_Medialib',
+            z: 'WP_Adv',
+            t: 'WP_More',
+            d: 'Strikethrough',
+            h: 'WP_Help',
+            p: 'WP_Page',
+            x: 'WP_Code'
+        }, function( command, key ) {
+            editor.shortcuts.add( 'access+' + key, '', command );
+        } );
+
+        editor.addShortcut( 'ctrl+s', '', function() {
+            if ( typeof wp !== 'undefined' && wp.autosave ) {
+                wp.autosave.server.triggerSave();
+            }
+        } );
+    } );
+
     /**
      * Experimental: create a floating toolbar.
-     * This functionality will change in the next releases. Not recommennded for use by plugins.
-     */     
+     * This functionality will change in the next releases. Not recommended for use by plugins.
+     */
     ( function() {
-        var DOM = tinymce.DOM,
-            each = tinymce.each,
-            Factory = tinymce.ui.Factory,
+        var Factory = tinymce.ui.Factory,
             settings = editor.settings,
             currentToolbar,