<!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>[33610] trunk/src/wp-admin: Customize: Fix layout issues in panels and sections when resizing and autofocusing.</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/33610">33610</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/33610","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-11 23:55:40 +0000 (Tue, 11 Aug 2015)</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'>Customize: Fix layout issues in panels and sections when resizing and autofocusing.
Also reverts <a href="https://core.trac.wordpress.org/changeset/33157">[33157]</a> which is no longer needed.
Props valendesigns, mattwiebe, westonruter, ocean90.
Fixes <a href="https://core.trac.wordpress.org/ticket/33220">#33220</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizenavmenuscss">trunk/src/wp-admin/css/customize-nav-menus.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizenavmenuscss"></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/customize-nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-nav-menus.css 2015-08-11 23:43:29 UTC (rev 33609)
+++ trunk/src/wp-admin/css/customize-nav-menus.css 2015-08-11 23:55:40 UTC (rev 33610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,11 +443,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .reordering .menu-item-depth-10 > .menu-item-bar { margin-right: 150px; }
</span><span class="cx" style="display: block; padding: 0 10px"> .reordering .menu-item-depth-11 > .menu-item-bar { margin-right: 165px; }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* Forces top margin to be zero for new menu */
-.control-section-nav_menu.open .menu {
- margin-top: 0 !important;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .control-section-nav_menu .menu .menu-item-edit-active {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></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/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2015-08-11 23:43:29 UTC (rev 33609)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-08-11 23:55:40 UTC (rev 33610)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,8 +68,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> params = params || {};
</span><span class="cx" style="display: block; padding: 0 10px"> focus = function () {
</span><span class="cx" style="display: block; padding: 0 10px"> var focusContainer;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( construct.extended( api.Panel ) && construct.expanded() ) {
- focusContainer = construct.container.find( '.control-panel-content:first' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( construct.expanded && construct.expanded() ) {
+ focusContainer = construct.container.find( 'ul:first' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> focusContainer = construct.container;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,13 +581,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {Object} args
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> onChangeExpanded: function ( expanded, args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var position, scroll, section = this,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var section = this,
</ins><span class="cx" style="display: block; padding: 0 10px"> container = section.container.closest( '.wp-full-overlay-sidebar-content' ),
</span><span class="cx" style="display: block; padding: 0 10px"> content = section.container.find( '.accordion-section-content' ),
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = section.container.closest( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn = section.container.find( '.customize-section-back' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle = section.container.find( '.accordion-section-title' ).first(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- expand;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headerActionsHeight = $( '#customize-header-actions' ).height(),
+ resizeContentHeight, expand, position, scroll;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( expanded && ! section.container.hasClass( 'open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> expand = args.completeCallback;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- expand = function () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ resizeContentHeight = function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var matchMedia, offset;
</span><span class="cx" style="display: block; padding: 0 10px"> matchMedia = window.matchMedia || window.msMatchMedia;
</span><span class="cx" style="display: block; padding: 0 10px"> offset = 90; // 45px for customize header actions + 45px for footer actions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,19 +605,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( matchMedia && matchMedia( '(max-width: 640px)' ).matches ) {
</span><span class="cx" style="display: block; padding: 0 10px"> offset = 45;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.css( 'height', ( window.innerHeight - offset ) );
+ };
+ expand = function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> section.container.addClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.addClass( 'section-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> position = content.offset().top;
</span><span class="cx" style="display: block; padding: 0 10px"> scroll = container.scrollTop();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.css( 'margin-top', ( 45 - position - scroll ) );
- content.css( 'height', ( window.innerHeight - offset ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.css( 'margin-top', ( headerActionsHeight - position - scroll ) );
+ resizeContentHeight();
</ins><span class="cx" style="display: block; padding: 0 10px"> sectionTitle.attr( 'tabindex', '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.attr( 'tabindex', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( args.completeCallback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> args.completeCallback();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Fix the height after browser resize.
+ $( window ).on( 'resize.customizer-section', _.debounce( resizeContentHeight, 100 ) );
+
+ // Fix the top margin after reflow.
+ api.bind( 'pane-contents-reflowed', _.debounce( function() {
+ var offset = ( content.offset().top - headerActionsHeight );
+ if ( 0 < offset ) {
+ content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - offset ) );
+ }
+ }, 100 ) );
</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">@@ -640,7 +654,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! expanded && section.container.hasClass( 'open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> section.container.removeClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.removeClass( 'section-open' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.css( 'margin-top', 'inherit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.css( 'margin-top', '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.attr( 'tabindex', '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle.attr( 'tabindex', '0' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,6 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( args.completeCallback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> args.completeCallback();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( window ).off( 'resize.customizer-section' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( args.completeCallback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> args.completeCallback();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1235,7 +1250,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ),
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn = section.find( '.customize-panel-back' ),
</span><span class="cx" style="display: block; padding: 0 10px"> panelTitle = section.find( '.accordion-section-title' ).first(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content = section.find( '.control-panel-content' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = section.find( '.control-panel-content' ),
+ headerActionsHeight = $( '#customize-header-actions' ).height();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( expanded ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1255,7 +1271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content.parent().show();
</span><span class="cx" style="display: block; padding: 0 10px"> position = content.offset().top;
</span><span class="cx" style="display: block; padding: 0 10px"> scroll = container.scrollTop();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.css( 'margin-top', ( $( '#customize-header-actions' ).height() - position - scroll ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.css( 'margin-top', ( headerActionsHeight - position - scroll ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> section.addClass( 'current-panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.addClass( 'in-sub-panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,6 +1282,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> topPanel.attr( 'tabindex', '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.attr( 'tabindex', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.focus();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Fix the top margin after reflow.
+ api.bind( 'pane-contents-reflowed', _.debounce( function() {
+ content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - ( content.offset().top - headerActionsHeight ) ) );
+ }, 100 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> siblings.removeClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> section.removeClass( 'current-panel' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2603,7 +2624,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _( constructs ).each( function ( activeConstructs, type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> api[ type ].each( function ( construct, id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var active = !! ( activeConstructs && activeConstructs[ id ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- construct.active( active );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( active ) {
+ construct.activate();
+ } else {
+ construct.deactivate();
+ }
</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></pre>
</div>
</div>
</body>
</html>