Changeset 29698

Timestamp:

09/03/2014 06:03:43 PM (11 years ago)

Author:

azaozz

Message:

Editor expand: revert back to scrolling to the editor top when switching Visual to Text, fixes #29338

File:

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

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

@@ -32 +32 @@
         scrollTimer,
         lastScrollPosition = 0,
-        visualEditorScrollPosition = 0,
-        textEditorScrollPosition = 0,
         pageYOffsetAtTop = 130,
         pinnedToolsTop = 56,
@@ -227 +225 @@
         // Adjust when switching editor modes.
         function mceShow() {
-            textEditorScrollPosition = window.pageYOffset;
-
             setTimeout( function() {
-                var top = $contentWrap.offset().top;
-
-                if ( window.pageYOffset > top || visualEditorScrollPosition ) {
-                    window.scrollTo( window.pageXOffset, visualEditorScrollPosition ? visualEditorScrollPosition : top - heights.adminBarHeight );
-                }
-
                 editor.execCommand( 'wpAutoResize' );
                 adjust();
             }, 300 );
-
-            adjust();
         }
 
         function mceHide() {
-            visualEditorScrollPosition = window.pageYOffset;
-
             setTimeout( function() {
                 var top = $contentWrap.offset().top;
 
-                if ( window.pageYOffset > top || textEditorScrollPosition ) {
-                    window.scrollTo( window.pageXOffset, textEditorScrollPosition ? textEditorScrollPosition : top - heights.adminBarHeight );
+                if ( window.pageYOffset > top ) {
+                    window.scrollTo( window.pageXOffset, top - heights.adminBarHeight );
                 }