<!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>[29978] trunk/src/wp-admin/js/common.js: Admin menu:</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/29978">29978</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/29978","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-21 06:11:07 +0000 (Tue, 21 Oct 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'>Admin menu:
- Fix scrolling the pinned menu with a mouse wheel.
- Fix pinning when the menu is only slightly taller than the viewport.
- Disable pinning on IE8, updating CSS top makes it jump when scrolling with a mouse wheel.
See <a href="https://core.trac.wordpress.org/ticket/29806">#29806</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js   2014-10-20 21:34:51 UTC (rev 29977)
+++ trunk/src/wp-admin/js/common.js     2014-10-21 06:11:07 UTC (rev 29978)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,6 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                currentPage = pageInput.val(),
</span><span class="cx" style="display: block; padding: 0 10px">                isIOS = /iPhone|iPad|iPod/.test( navigator.userAgent ),
</span><span class="cx" style="display: block; padding: 0 10px">                isAndroid = navigator.userAgent.indexOf( 'Android' ) !== -1,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                isIE8 = $( document.documentElement ).hasClass( 'ie8' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 $document = $( document ),
</span><span class="cx" style="display: block; padding: 0 10px">                $window = $( window ),
</span><span class="cx" style="display: block; padding: 0 10px">                $body = $( document.body ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,6 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                menuTop = 0,
</span><span class="cx" style="display: block; padding: 0 10px">                height = {
</span><span class="cx" style="display: block; padding: 0 10px">                        window: $window.height(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        wpwrap: $wpwrap.height(),
</ins><span class="cx" style="display: block; padding: 0 10px">                         adminbar: $adminbar.height(),
</span><span class="cx" style="display: block; padding: 0 10px">                        menu: $adminMenuWrap.height()
</span><span class="cx" style="display: block; padding: 0 10px">                };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,18 +537,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">        function pinMenu() {
</span><span class="cx" style="display: block; padding: 0 10px">                var windowPos = $window.scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( isIOS || $adminmenu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( isIOS || isIE8 || $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</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">+                if ( height.menu + height.adminbar + 20 > height.wpwrap ) { // 20px "buffer"
+                       unpinMenu();
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( height.menu + height.adminbar > height.window ) {
</span><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="cx" style="display: block; padding: 0 10px">                                        // let it scroll
</span><span class="cx" style="display: block; padding: 0 10px">                                        pinnedMenuTop = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        menuTop = $adminMenuWrap.offset().top - height.adminbar;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 menuTop = $adminMenuWrap.offset().top - height.adminbar - ( windowPos - lastScrollPosition );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        if ( menuTop + height.menu + height.adminbar < windowPos + height.window ) {
+                                               menuTop = windowPos + height.window - height.menu - height.adminbar;
+                                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $adminMenuWrap.css({
</span><span class="cx" style="display: block; padding: 0 10px">                                                position: 'absolute',
</span><span class="cx" style="display: block; padding: 0 10px">                                                top: menuTop,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,8 +578,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( pinnedMenuBottom ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        // let it scroll
</span><span class="cx" style="display: block; padding: 0 10px">                                        pinnedMenuBottom = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        menuTop = $adminMenuWrap.offset().top - height.adminbar;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 menuTop = $adminMenuWrap.offset().top - height.adminbar + ( lastScrollPosition - windowPos );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        if ( menuTop + height.menu > windowPos + height.window ) {
+                                               menuTop = windowPos;
+                                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $adminMenuWrap.css({
</span><span class="cx" style="display: block; padding: 0 10px">                                                position: 'absolute',
</span><span class="cx" style="display: block; padding: 0 10px">                                                top: menuTop,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,13 +602,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                // Resizing
</span><span class="cx" style="display: block; padding: 0 10px">                                pinnedMenuTop = pinnedMenuBottom = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                menuTop = $adminMenuWrap.offset().top - height.adminbar;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         menuTop = windowPos + height.window - height.menu - height.adminbar - 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $adminMenuWrap.css({
-                                       position: 'absolute',
-                                       top: menuTop,
-                                       bottom: ''
-                               });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( menuTop > 0 ) {
+                                       $adminMenuWrap.css({
+                                               position: 'absolute',
+                                               top: menuTop,
+                                               bottom: ''
+                                       });
+                               } else {
+                                       unpinMenu();
+                               }
</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"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,21 +645,10 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        setPinMenu();
-
</del><span class="cx" style="display: block; padding: 0 10px">         if ( ! isIOS ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $window.on( 'scroll.pin-menu', pinMenu );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</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', function() {
-               height.window = $window.height();
-               height.adminbar = $adminbar.height();
-               setPinMenu();
-       }).on( 'wp-collapse-menu.pin-menu', function() {
-               height.menu = $adminMenuWrap.height();
-               setPinMenu();
-       });
-
</del><span class="cx" style="display: block; padding: 0 10px">         window.wpResponsive = {
</span><span class="cx" style="display: block; padding: 0 10px">                init: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                        var self = this;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,6 +783,19 @@
</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">        window.wpResponsive.init();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        setPinMenu();
+
+       $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();
+       });
+
</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>