<!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>[29656] trunk/src/wp-admin/js/editor-expand.js: Editor expand:</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/29656">29656</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-09-01 18:48:07 +0000 (Mon, 01 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor expand:
- Adjust calculation when comparing sidebar position to wpfooter top. Fixes an annoying jumping when the user scrolls off the bottom.
- Use a var for the 'bottom' distance of the sidebar.
- Fix sidebar pinning when it's height is nearly the same as the viewport height.
Fixes <a href="http://core.trac.wordpress.org/ticket/29349">#29349</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 (29655 => 29656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor-expand.js 2014-09-01 18:38:35 UTC (rev 29655)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-09-01 18:48:07 UTC (rev 29656)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> lastScrollPosition = 0,
</span><span class="cx"> pageYOffsetAtTop = 130,
</span><span class="cx"> pinnedToolsTop = 56,
</span><ins>+ sidebarBottom = 20,
</ins><span class="cx"> autoresizeMinHeight = 300,
</span><span class="cx"> initialMode = window.getUserSetting( 'editor' ),
</span><span class="cx"> // These are corrected when adjust() runs, except on scrolling if already set.
</span><span class="lines">@@ -432,7 +433,7 @@
</span><span class="cx"> $document.height() > ( $sideSortables.height() + postBodyTop + 120 ) && // the sidebar is not the tallest element
</span><span class="cx"> heights.windowHeight < editorHeight ) { // the editor is taller than the viewport
</span><span class="cx">
</span><del>- if ( heights.sideSortablesHeight > heights.windowHeight || fixedSideTop || fixedSideBottom ) {
</del><ins>+ if ( ( heights.sideSortablesHeight + pinnedToolsTop + sidebarBottom ) > heights.windowHeight || fixedSideTop || fixedSideBottom ) {
</ins><span class="cx"> // Reset when scrolling to the top
</span><span class="cx"> if ( windowPos + pinnedToolsTop <= postBodyTop ) {
</span><span class="cx"> $sideSortables.attr( 'style', '' );
</span><span class="lines">@@ -447,8 +448,8 @@
</span><span class="cx"> footerTop = $footer.offset().top;
</span><span class="cx">
</span><span class="cx"> // don't get over the footer
</span><del>- if ( footerTop < sidebarTop + heights.sideSortablesHeight + 20 ) {
- sidebarTop = footerTop - heights.sideSortablesHeight - 20;
</del><ins>+ if ( footerTop < sidebarTop + heights.sideSortablesHeight + sidebarBottom ) {
+ sidebarTop = footerTop - heights.sideSortablesHeight - 12;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $sideSortables.css({
</span><span class="lines">@@ -456,14 +457,14 @@
</span><span class="cx"> top: sidebarTop,
</span><span class="cx"> bottom: ''
</span><span class="cx"> });
</span><del>- } else if ( ! fixedSideBottom && heights.sideSortablesHeight + $sideSortables.offset().top + 20 < windowPos + heights.windowHeight ) {
</del><ins>+ } else if ( ! fixedSideBottom && heights.sideSortablesHeight + $sideSortables.offset().top + sidebarBottom < windowPos + heights.windowHeight ) {
</ins><span class="cx"> // pin the bottom
</span><span class="cx"> fixedSideBottom = true;
</span><span class="cx">
</span><span class="cx"> $sideSortables.css({
</span><span class="cx"> position: 'fixed',
</span><span class="cx"> top: 'auto',
</span><del>- bottom: '20px'
</del><ins>+ bottom: sidebarBottom
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> } else if ( windowPos < lastScrollPosition ) {
</span><span class="lines">@@ -471,12 +472,12 @@
</span><span class="cx"> if ( fixedSideBottom ) {
</span><span class="cx"> // let it scroll
</span><span class="cx"> fixedSideBottom = false;
</span><del>- sidebarTop = $sideSortables.offset().top - 20;
</del><ins>+ sidebarTop = $sideSortables.offset().top - sidebarBottom;
</ins><span class="cx"> footerTop = $footer.offset().top;
</span><span class="cx">
</span><span class="cx"> // don't get over the footer
</span><del>- if ( footerTop < sidebarTop + heights.sideSortablesHeight + 20 ) {
- sidebarTop = footerTop - heights.sideSortablesHeight - 20;
</del><ins>+ if ( footerTop < sidebarTop + heights.sideSortablesHeight + sidebarBottom ) {
+ sidebarTop = footerTop - heights.sideSortablesHeight - 12;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $sideSortables.css({
</span><span class="lines">@@ -499,6 +500,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // if the sidebar container is smaller than the viewport, then pin/unpin the top when scrolling
</span><span class="cx"> if ( windowPos >= ( postBodyTop - pinnedToolsTop ) ) {
</span><ins>+
</ins><span class="cx"> $sideSortables.css( {
</span><span class="cx"> position: 'fixed',
</span><span class="cx"> top: pinnedToolsTop
</span><span class="lines">@@ -569,7 +571,7 @@
</span><span class="cx"> // Adjust when collapsing the menu, changing the columns, changing the body class.
</span><span class="cx"> $document.on( 'wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand', adjust )
</span><span class="cx"> .on( 'postbox-toggled.editor-expand', function() {
</span><del>- if ( ! fixedSideTop && ! fixedSideBottom && window.pageYOffset > 20 ) {
</del><ins>+ if ( ! fixedSideTop && ! fixedSideBottom && window.pageYOffset > pinnedToolsTop ) {
</ins><span class="cx"> fixedSideBottom = true;
</span><span class="cx"> window.scrollBy( 0, -1 );
</span><span class="cx"> adjust();
</span></span></pre>
</div>
</div>
</body>
</html>