Changeset 42175

Timestamp:

11/14/2017 05:18:10 AM (7 years ago)

Author:

pento

Message:

Editor: When switching Editor tabs, don't scroll unnecessarily.

• When switching to the Text view, wait until after the Visual editor element has been hidden, before focussing the <textarea>.
• When switching to the Visual view, only scroll if the cursor is not visible on the current screen.

Fixes #42530.

File:

• trunk/src/wp-admin/js/editor.js (modified) (3 diffs)

trunk/src/wp-admin/js/editor.js

@@ -635 +635 @@
                 selectionPosition = TinyMCEContentAreaTop + elementTop,
                 visibleAreaHeight = windowHeight - ( edToolsHeight + toolbarHeight );
+
+            // There's no need to scroll if the selection is inside the visible area.
+            if ( selectionPosition < visibleAreaHeight ) {
+                return;
+            }
 
             /**
@@ -853 +858 @@
 
             if ( textArea.focus ) {
-                // focus and scroll to the position
+                // Wait for the Visual editor to be hidden, then focus and scroll to the position
                 setTimeout( function() {
+                    textArea.setSelectionRange( start, end );
                     if ( textArea.blur ) {
                         // defocus before focusing
@@ -861 +867 @@
                     textArea.focus();
                 }, 100 );
-
-                textArea.focus();
-            }
-
-            textArea.setSelectionRange( start, end );
+            }
         }