<!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>[29835] trunk/src/wp-admin: Pin the admin menu on scrolling similarly to how the side metaboxes are pinned on the Edit Post screen, first run.</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/29835">29835</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/29835","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-05 03:08:11 +0000 (Sun, 05 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'>Pin the admin menu on scrolling similarly to how the side metaboxes are pinned on the Edit Post screen, first run. See <a href="https://core.trac.wordpress.org/ticket/29806">#29806</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssadminmenucss">trunk/src/wp-admin/css/admin-menu.css</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssadminmenucss"></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/css/admin-menu.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/admin-menu.css 2014-10-04 13:11:38 UTC (rev 29834)
+++ trunk/src/wp-admin/css/admin-menu.css 2014-10-05 03:08:11 UTC (rev 29835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #adminmenu {
</span><span class="cx" style="display: block; padding: 0 10px"> clear: left;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 12px 0 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 12px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> list-style: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<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-04 13:11:38 UTC (rev 29834)
+++ trunk/src/wp-admin/js/common.js 2014-10-05 03:08:11 UTC (rev 29835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,49 +550,110 @@
</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="cx" style="display: block; padding: 0 10px"> $adminMenuWrap = $( '#adminmenuwrap' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $collapseMenu = $( '#collapse-menu' ),
</del><span class="cx" style="display: block; padding: 0 10px"> $wpwrap = $( '#wpwrap' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $adminmenu = $( '#adminmenu' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $overlay = $( '#wp-responsive-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $toolbar = $( '#wp-toolbar' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $toolbarPopups = $toolbar.find( 'a[aria-haspopup="true"]' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $sortables = $('.meta-box-sortables'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- stickyMenuActive = false,
- wpResponsiveActive = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpResponsiveActive = false,
+ $adminbar = $( '#wpadminbar' ),
+ lastScrollPosition = 0,
+ fixedMenuTop = false,
+ fixedMenuBottom = false,
+ menuTop = 0,
+ height = {
+ window: $window.height(),
+ adminbar: $adminbar.height(),
+ menu: $adminMenuWrap.height()
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.stickyMenu = {
- enable: function() {
- if ( ! stickyMenuActive ) {
- $document.on( 'wp-window-resized.sticky-menu', $.proxy( this.update, this ) );
- $collapseMenu.on( 'click.sticky-menu', $.proxy( this.update, this ) );
- this.update();
- stickyMenuActive = true;
- }
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function pinMenu() {
+ var windowPos = $window.scrollTop();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- disable: function() {
- if ( stickyMenuActive ) {
- $window.off( 'resize.sticky-menu' );
- $collapseMenu.off( 'click.sticky-menu' );
- $body.removeClass( 'sticky-menu' );
- stickyMenuActive = false;
- }
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $adminmenu.data('wp-responsive') ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update: function() {
- // Make the admin menu sticky if the viewport is taller than it
- if ( $window.height() > $adminMenuWrap.height() + 32 ) {
- if ( ! $body.hasClass( 'sticky-menu' ) ) {
- $body.addClass( 'sticky-menu' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( height.menu + height.adminbar > height.window ) {
+ if ( windowPos > lastScrollPosition ) {
+ // Scrolling down
+ if ( fixedMenuTop ) {
+ // let it scroll
+ fixedMenuTop = false;
+ menuTop = $adminMenuWrap.offset().top - height.adminbar;
+
+ $adminMenuWrap.css({
+ position: 'absolute',
+ top: menuTop,
+ bottom: ''
+ });
+ } else if ( ! fixedMenuBottom && $adminMenuWrap.offset().top + height.menu < windowPos + height.window ) {
+ // pin the bottom
+ fixedMenuBottom = true;
+
+ $adminMenuWrap.css({
+ position: 'fixed',
+ top: '',
+ bottom: 0
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- if ( $body.hasClass( 'sticky-menu' ) ) {
- $body.removeClass( 'sticky-menu' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( windowPos < lastScrollPosition ) {
+ // Scrolling up
+ if ( fixedMenuBottom ) {
+ // let it scroll
+ fixedMenuBottom = false;
+ menuTop = $adminMenuWrap.offset().top - height.adminbar;
+
+ $adminMenuWrap.css({
+ position: 'absolute',
+ top: menuTop,
+ bottom: ''
+ });
+ } else if ( ! fixedMenuTop && $adminMenuWrap.offset().top >= windowPos + height.adminbar ) {
+ // pin the top
+ fixedMenuTop = true;
+
+ $adminMenuWrap.css({
+ position: 'fixed',
+ top: '',
+ bottom: ''
+ });
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- };
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ lastScrollPosition = windowPos;
+ }
+
+ function setPinMenu() {
+ if ( $adminmenu.data('wp-responsive') ) {
+ $body.removeClass( 'sticky-menu' );
+ $adminMenuWrap.css({
+ position: '',
+ top: '',
+ bottom: ''
+ });
+ } else if ( height.menu + height.adminbar > height.window ) {
+ $body.removeClass( 'sticky-menu' );
+ pinMenu();
+ } else {
+ $body.addClass( 'sticky-menu' );
+ }
+ }
+
+ setPinMenu();
+ $window.on( 'scroll.pin-menu', pinMenu );
+
+ $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();
+ });
+
</ins><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">@@ -642,7 +703,7 @@
</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"> activate: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.stickyMenu.disable();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setPinMenu();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $body.hasClass( 'auto-fold' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.addClass( 'auto-fold' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +714,7 @@
</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"> deactivate: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.stickyMenu.enable();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setPinMenu();
</ins><span class="cx" style="display: block; padding: 0 10px"> $adminmenu.removeData('wp-responsive');
</span><span class="cx" style="display: block; padding: 0 10px"> this.enableSortables();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,7 +787,6 @@
</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">- window.stickyMenu.enable();
</del><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>