<!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>[26125] trunk/src/wp-admin: Merge the sticky menu component from MP6.</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/26125">26125</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-11-13 04:29:27 +0000 (Wed, 13 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge the sticky menu component from MP6. The admin menu is now fixed if the viewport is large enough. props tollmanz, tillkruess, dd32. see <a href="http://core.trac.wordpress.org/ticket/25858">#25858</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.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="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26124 => 26125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-13 04:16:43 UTC (rev 26124)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-13 04:29:27 UTC (rev 26125)
</span><span class="lines">@@ -1919,6 +1919,19 @@
</span><span class="cx"> height: 34px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Sticky admin menu */
+
+.sticky-menu #wpwrap {
+ z-index: 1; /* prevent flyouts from going behind content in Webkit */
+}
+
+.sticky-menu #adminmenuwrap {
+ position: fixed;
+ top: 32px;
+ left: 0;
+ z-index: 2; /* needs to be above .sticky-menu #wpwrap */
+}
+
</ins><span class="cx"> /* A new arrow */
</span><span class="cx">
</span><span class="cx"> .wp-menu-arrow {
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (26124 => 26125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2013-11-13 04:16:43 UTC (rev 26124)
+++ trunk/src/wp-admin/js/common.js 2013-11-13 04:29:27 UTC (rev 26125)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /* global setUserSetting, ajaxurl, commonL10n, alert, confirm, toggleWithKeyboard, pagenow */
</span><del>-var showNotice, adminMenu, columns, validateForm, screenMeta;
</del><ins>+var showNotice, adminMenu, columns, validateForm, screenMeta, stickyMenu;
</ins><span class="cx"> (function($){
</span><span class="cx"> // Removed in 3.3.
</span><span class="cx"> // (perhaps) needed for back-compat
</span><span class="lines">@@ -447,6 +447,89 @@
</span><span class="cx"> })();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+stickyMenu = {
+ active: false,
+
+ init: function () {
+ this.$window = $( window );
+ this.$body = $( document.body );
+ this.$adminMenuWrap = $( '#adminmenuwrap' );
+ this.$collapseMenu = $( '#collapse-menu' );
+ this.bodyMinWidth = parseInt( this.$body.css( 'min-width' ), 10 );
+ this.enable();
+ },
+
+ enable: function () {
+ if ( ! this.active ) {
+ this.$window.on( 'resize.stickyMenu scroll.stickyMenu', this.debounce(
+ $.proxy( this.update, this ), 200
+ ) );
+ this.$collapseMenu.on( 'click.stickyMenu', $.proxy( this.update, this ) );
+ this.update();
+ this.active = true;
+ }
+ },
+
+ disable: function () {
+ if ( this.active ) {
+ this.$window.off( 'resize.stickyMenu scroll.stickyMenu' );
+ this.$collapseMenu.off( 'click.stickyMenu' );
+ this.$body.removeClass( 'sticky-menu' );
+ this.active = false;
+ }
+ },
+
+ update: function () {
+ // Make the admin menu sticky if both of the following:
+ // 1. The viewport is taller than the admin menu
+ // 2. The viewport is wider than the min-width of the <body>
+ if ( this.$window.height() > this.$adminMenuWrap.height() + 32 && this.$window.width() > this.bodyMinWidth) {
+ if ( ! this.$body.hasClass( 'sticky-menu' ) ) {
+ this.$body.addClass( 'sticky-menu' );
+ }
+ } else {
+ if ( this.$body.hasClass( 'sticky-menu' ) ) {
+ this.$body.removeClass( 'sticky-menu' );
+ }
+ }
+ },
+
+ // Borrowed from Underscore.js
+ debounce: function( func, wait, immediate ) {
+ var timeout, args, context, timestamp, result;
+ return function() {
+ var later, callNow;
+ context = this;
+ args = arguments;
+ timestamp = new Date().getTime();
+ later = function() {
+ var last = new Date().getTime() - timestamp;
+ if ( last < wait ) {
+ timeout = setTimeout( later, wait - last );
+ } else {
+ timeout = null;
+ if ( ! immediate ) {
+ result = func.apply( context, args );
+ context = args = null;
+ }
+ }
+ };
+ callNow = immediate && !timeout;
+ if ( ! timeout ) {
+ timeout = setTimeout( later, wait );
+ }
+ if ( callNow ) {
+ result = func.apply( context, args );
+ context = args = null;
+ }
+
+ return result;
+ };
+ }
+};
+
+stickyMenu.init();
+
</ins><span class="cx"> // internal use
</span><span class="cx"> $(document).bind( 'wp_CloseOnEscape', function( e, data ) {
</span><span class="cx"> if ( typeof(data.cb) != 'function' )
</span></span></pre>
</div>
</div>
</body>
</html>