From 44466b762717d7b37a90bfa674dc7ccca4274b94 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 3 Sep 2014 18:03:43 +0000
Subject: [PATCH] Editor expand: revert back to scrolling to the editor top
 when switching Visual to Text, fixes #29338

git-svn-id: https://develop.svn.wordpress.org/trunk@29698 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/js/editor-expand.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js
index 35f5ea5ac9..ab5e8854d1 100644
--- a/src/wp-admin/js/editor-expand.js
+++ b/src/wp-admin/js/editor-expand.js
@@ -31,8 +31,6 @@ jQuery( document ).ready( function($) {
 		fixedSideBottom = false,
 		scrollTimer,
 		lastScrollPosition = 0,
-		visualEditorScrollPosition = 0,
-		textEditorScrollPosition = 0,
 		pageYOffsetAtTop = 130,
 		pinnedToolsTop = 56,
 		sidebarBottom = 20,
@@ -226,30 +224,18 @@ jQuery( document ).ready( function($) {
 
 		// 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();