Changeset 36982

Timestamp:

03/13/2016 10:43:10 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE, inline link: when doing undo/redo with keyboard shortcut, do not focus the inline dialog. Cannot do consecutive undo/redo if the focus is moved away from the editor.

See #33301.

File:

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

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

@@ -91 +91 @@
                 var inputInstance;
                 var linkNode;
+                var doingUndoRedo;
+                var doingUndoRedoTimer;
                 var $ = window.jQuery;
 
@@ -167 +169 @@
                                                                 }
 
-                                                                element.focus();
-                                                                element.select();
+                                                                if ( ! doingUndoRedo ) {
+                                                                        element.focus();
+                                                                        element.select();
+                                                                }
                                                         }
                                                 } );
@@ -301 +305 @@
                         }
                 });
+
+                // When doing undo and redo with keyboard shortcuts (Ctrl|Cmd+Z, Ctrl|Cmd+Shift+Z, Ctrl|Cmd+Y),
+                // set a flag to not focus the inline dialog. The editor has to remain focused so the users can do consecutive undo/redo.
+                editor.on( 'keydown', function( event ) {
+                        if ( event.altKey || ( tinymce.Env.mac && ( ! event.metaKey || event.ctrlKey ) ) ||
+                                ( ! tinymce.Env.mac && ! event.ctrlKey ) ) {
+
+                                return;
+                        }
+
+                        if ( event.keyCode === 89 || event.keyCode === 90 ) { // Y or Z
+                                doingUndoRedo = true;
+
+                                window.clearTimeout( doingUndoRedoTimer );
+                                doingUndoRedoTimer = window.setTimeout( function() {
+                                        doingUndoRedo = false;
+                                }, 500 );
+                        }
+                } );
 
                 editor.addButton( 'wp_link_preview', {