<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29693] trunk/src/wp-admin/js/editor-expand.js: Editor scrolling: Remember and restore scroll position for visual and text modes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29693">29693</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-09-03 09:57:56 +0000 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor scrolling: Remember and restore scroll position for visual and text modes.
This prevents the editor from jumping off screen when the rendered visual content is significantly taller than plain text, e.g. when there are views present.
This is also a close restoration of 3.9 behavior, some of which was browser-specific.
props avryl.
fixes <a href="http://core.trac.wordpress.org/ticket/29338">#29338</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorexpandjs">trunk/src/wp-admin/js/editor-expand.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditorexpandjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor-expand.js (29692 => 29693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor-expand.js 2014-09-03 09:37:01 UTC (rev 29692)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-09-03 09:57:56 UTC (rev 29693)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> fixedSideBottom = false,
</span><span class="cx"> scrollTimer,
</span><span class="cx"> lastScrollPosition = 0,
</span><ins>+ visualEditorScrollPosition = 0,
+ textEditorScrollPosition = 0,
</ins><span class="cx"> pageYOffsetAtTop = 130,
</span><span class="cx"> pinnedToolsTop = 56,
</span><span class="cx"> sidebarBottom = 20,
</span><span class="lines">@@ -224,21 +226,36 @@
</span><span class="cx">
</span><span class="cx"> // Adjust when switching editor modes.
</span><span class="cx"> function mceShow() {
</span><ins>+ textEditorScrollPosition = window.pageYOffset;
+
</ins><span class="cx"> setTimeout( function() {
</span><ins>+ var top = $contentWrap.offset().top;
+
+ if ( window.pageYOffset > top || visualEditorScrollPosition ) {
+ window.scrollTo( window.pageXOffset, visualEditorScrollPosition ? visualEditorScrollPosition : top - heights.adminBarHeight );
+ }
+
</ins><span class="cx"> editor.execCommand( 'wpAutoResize' );
</span><span class="cx"> adjust();
</span><span class="cx"> }, 300 );
</span><ins>+
+ adjust();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function mceHide() {
</span><del>- var wrapHeight = $( '#wpwrap' ).height();
</del><ins>+ visualEditorScrollPosition = window.pageYOffset;
</ins><span class="cx">
</span><del>- textEditorResize();
</del><ins>+ setTimeout( function() {
+ var top = $contentWrap.offset().top;
</ins><span class="cx">
</span><del>- if ( wrapHeight && $window.scrollTop() > wrapHeight ) {
- window.scrollTo( window.pageXOffset, wrapHeight - 1 );
- }
</del><ins>+ if ( window.pageYOffset > top || textEditorScrollPosition ) {
+ window.scrollTo( window.pageXOffset, textEditorScrollPosition ? textEditorScrollPosition : top - heights.adminBarHeight );
+ }
</ins><span class="cx">
</span><ins>+ textEditorResize();
+ adjust();
+ }, 100 );
+
</ins><span class="cx"> adjust();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>