<!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>[30917] branches/4.1: Fix menu shakiness when over-scrolling in Chrome and Safari on MacOS.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30917">30917</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30917","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-16 19:41:34 +0000 (Tue, 16 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Fix menu shakiness when over-scrolling in Chrome and Safari on MacOS.
Merges <a href="https://core.trac.wordpress.org/changeset/30844">[30844]</a> to the 4.1 branch.
See <a href="https://core.trac.wordpress.org/ticket/30692">#30692</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpadminjscommonjs">branches/4.1/src/wp-admin/js/common.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.1 2014-12-16 19:35:32 UTC (rev 30916)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2014-12-16 19:41:34 UTC (rev 30917)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30843,30846-30847,30849,30854,30856-30857,30865-30867,30871-30874,30879,30884,30887-30890,30900,30903
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30844,30846-30847,30849,30854,30856-30857,30865-30867,30871-30874,30879,30884,30887-30890,30900,30903
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpadminjscommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/js/common.js 2014-12-16 19:35:32 UTC (rev 30916)
+++ branches/4.1/src/wp-admin/js/common.js 2014-12-16 19:41:34 UTC (rev 30917)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,8 +193,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> lastScrollPosition = 0,
</span><span class="cx" style="display: block; padding: 0 10px"> pinnedMenuTop = false,
</span><span class="cx" style="display: block; padding: 0 10px"> pinnedMenuBottom = false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isScrolling = false,
+ scrollTimer,
</ins><span class="cx" style="display: block; padding: 0 10px"> menuTop = 0,
</span><span class="cx" style="display: block; padding: 0 10px"> height = {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ document: $document.height(),
</ins><span class="cx" style="display: block; padding: 0 10px"> window: $window.height(),
</span><span class="cx" style="display: block; padding: 0 10px"> wpwrap: $wpwrap.height(),
</span><span class="cx" style="display: block; padding: 0 10px"> adminbar: $adminbar.height(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,6 +557,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( height.menu + height.adminbar > height.window ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for overscrolling
+ if ( windowPos < 0 ) {
+ if ( ! pinnedMenuTop ) {
+ pinnedMenuTop = true;
+ pinnedMenuBottom = false;
+
+ $adminMenuWrap.css({
+ position: 'fixed',
+ top: '',
+ bottom: ''
+ });
+ }
+
+ return;
+ } else if ( windowPos + height.window > height.document - 1 ) {
+ if ( ! pinnedMenuBottom ) {
+ pinnedMenuBottom = true;
+ pinnedMenuTop = false;
+
+ $adminMenuWrap.css({
+ position: 'fixed',
+ top: '',
+ bottom: 0
+ });
+ }
+
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( windowPos > lastScrollPosition ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Scrolling down
</span><span class="cx" style="display: block; padding: 0 10px"> if ( pinnedMenuTop ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,6 +658,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> lastScrollPosition = windowPos;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function resetHeights() {
+ height = {
+ document: $document.height(),
+ window: $window.height(),
+ wpwrap: $wpwrap.height(),
+ adminbar: $adminbar.height(),
+ menu: $adminMenuWrap.height()
+ };
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function unpinMenu() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isIOS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,6 +682,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setPinMenu() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ resetHeights();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $adminmenu.data('wp-responsive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.removeClass( 'sticky-menu' );
</span><span class="cx" style="display: block; padding: 0 10px"> unpinMenu();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,8 +696,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function scrollStart() {
+ if ( isScrolling ) {
+ window.clearTimeout( scrollTimer );
+
+ scrollTimer = window.setTimeout( function() {
+ isScrolling = false;
+ }, 200 );
+ } else {
+ isScrolling = true;
+ $document.triggerHandler( 'wp-scroll-start' );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isIOS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $window.on( 'scroll.pin-menu', pinMenu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $window.on( 'scroll.pin-menu', function() {
+ scrollStart();
+ pinMenu();
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,17 +852,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $document.on( 'wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu', function() {
- height.wpwrap = $wpwrap.height();
- height.window = $window.height();
- height.adminbar = $adminbar.height();
- setPinMenu();
- }).on( 'wp-collapse-menu.pin-menu', function() {
- height.wpwrap = $wpwrap.height();
- height.menu = $adminMenuWrap.height();
- setPinMenu();
- });
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.on( 'wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fire a custom jQuery event at the end of window resize
</span></span></pre>
</div>
</div>
</body>
</html>