Ticket #29338: 29338.9.patch

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

@@ -31 +31 @@
                 fixedSideBottom = false,
                 scrollTimer,
                 lastScrollPosition = 0,
-                visualEditorScrollPosition = 0,
-                textEditorScrollPosition = 0,
                 pageYOffsetAtTop = 130,
                 pinnedToolsTop = 56,
                 sidebarBottom = 20,
@@ -226 +224 @@
 
                 // 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 );
                                 }
 
                                 textEditorResize();