<!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>[27798] trunk/src/wp-admin: Widget Customizer: Improve behavior of bigger widgets.</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/27798">27798</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-03-27 23:12:25 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Widget Customizer: Improve behavior of bigger widgets.
* Support widgets which are higher than browsers viewport.
* Use widgets width as max-width.
* Don't animate the width of wide widgets to make them visible, instead fade them in/out.
* Fix Chrome flickerings while updating wide widgets.
props adamsilverstein, westonruter, ocean90.
see <a href="http://core.trac.wordpress.org/ticket/27348">#27348</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizewidgetscss">trunk/src/wp-admin/css/customize-widgets.css</a></li>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizewidgetscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/customize-widgets.css (27797 => 27798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/customize-widgets.css 2014-03-27 22:40:06 UTC (rev 27797)
+++ trunk/src/wp-admin/css/customize-widgets.css 2014-03-27 23:12:25 UTC (rev 27798)
</span><span class="lines">@@ -50,16 +50,16 @@
</span><span class="cx"> left: auto !important;
</span><span class="cx"> max-width: 100%;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .customize-control-widget_form.wide-widget-control .widget-inside {
</span><span class="cx"> position: fixed;
</span><span class="cx"> left: 299px;
</span><span class="cx"> top: 25%;
</span><del>- padding: 20px;
</del><span class="cx"> border: 1px solid rgb(229, 229, 229);
</span><del>- z-index: -1;
</del><ins>+ overflow: auto;
</ins><span class="cx"> }
</span><del>-.customize-control-widget_form.wide-widget-control.collapsing .widget-inside {
- z-index: -2;
</del><ins>+.customize-control-widget_form.wide-widget-control .widget-inside > .form {
+ padding: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .customize-control-widget_form.wide-widget-control .widget-top {
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizewidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/customize-widgets.js (27797 => 27798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-widgets.js 2014-03-27 22:40:06 UTC (rev 27797)
+++ trunk/src/wp-admin/js/customize-widgets.js 2014-03-27 23:12:25 UTC (rev 27798)
</span><span class="lines">@@ -703,6 +703,7 @@
</span><span class="cx"> _setupWideWidget: function () {
</span><span class="cx"> var control = this,
</span><span class="cx"> widget_inside,
</span><ins>+ widget_form,
</ins><span class="cx"> customize_sidebar,
</span><span class="cx"> position_widget,
</span><span class="cx"> theme_controls_container;
</span><span class="lines">@@ -712,11 +713,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> widget_inside = control.container.find( '.widget-inside' );
</span><ins>+ widget_form = widget_inside.find( '> .form' );
</ins><span class="cx"> customize_sidebar = $( '.wp-full-overlay-sidebar-content:first' );
</span><span class="cx"> control.container.addClass( 'wide-widget-control' );
</span><span class="cx">
</span><span class="cx"> control.container.find( '.widget-content:first' ).css( {
</span><del>- 'min-width': control.params.width,
</del><ins>+ 'max-width': control.params.width,
</ins><span class="cx"> 'min-height': control.params.height
</span><span class="cx"> } );
</span><span class="cx">
</span><span class="lines">@@ -725,31 +727,37 @@
</span><span class="cx"> * element is at the same top position as the widget-top. When the
</span><span class="cx"> * widget-top is scrolled out of view, keep the widget-top in view;
</span><span class="cx"> * likewise, don't allow the widget to drop off the bottom of the window.
</span><ins>+ * If a widget is too tall to fit in the window, don't let the height
+ * exceed the window height so that the contents of the widget control
+ * will become scrollable (overflow:auto).
</ins><span class="cx"> */
</span><span class="cx"> position_widget = function () {
</span><span class="cx"> var offset_top = control.container.offset().top,
</span><del>- height,
- top,
- max_top;
-
- height = widget_inside.outerHeight();
- top = Math.max( offset_top, 0 );
- max_top = $( window ).height() - height;
- top = Math.min( top, max_top );
</del><ins>+ window_height = $( window ).height(),
+ form_height = widget_form.outerHeight(),
+ top;
+ widget_inside.css( 'max-height', window_height );
+ top = Math.max(
+ 0, // prevent top from going off screen
+ Math.min(
+ Math.max( offset_top, 0 ), // distance widget in panel is from top of screen
+ window_height - form_height // flush up against bottom of screen
+ )
+ );
</ins><span class="cx"> widget_inside.css( 'top', top );
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> theme_controls_container = $( '#customize-theme-controls' );
</span><span class="cx"> control.container.on( 'expand', function () {
</span><ins>+ position_widget();
</ins><span class="cx"> customize_sidebar.on( 'scroll', position_widget );
</span><span class="cx"> $( window ).on( 'resize', position_widget );
</span><span class="cx"> theme_controls_container.on( 'expanded collapsed', position_widget );
</span><del>- position_widget();
</del><span class="cx"> } );
</span><span class="cx"> control.container.on( 'collapsed', function () {
</span><span class="cx"> customize_sidebar.off( 'scroll', position_widget );
</span><ins>+ $( window ).off( 'resize', position_widget );
</ins><span class="cx"> theme_controls_container.off( 'expanded collapsed', position_widget );
</span><del>- $( window ).off( 'resize', position_widget );
</del><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> // Reposition whenever a sidebar's widgets are changed
</span><span class="lines">@@ -1375,7 +1383,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- complete;
</del><span class="cx"> if ( do_expand ) {
</span><span class="cx"> // Close all other widget controls before expanding this one
</span><span class="cx"> wp.customize.control.each( function ( other_control ) {
</span><span class="lines">@@ -1384,18 +1391,18 @@
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><del>- control.container.trigger( 'expand' );
- control.container.addClass( 'expanding' );
</del><span class="cx"> complete = function () {
</span><span class="cx"> control.container.removeClass( 'expanding' );
</span><span class="cx"> control.container.addClass( 'expanded' );
</span><span class="cx"> control.container.trigger( 'expanded' );
</span><span class="cx"> };
</span><span class="cx"> if ( control.params.is_wide ) {
</span><del>- inside.animate( { width: 'show' }, 'fast', complete );
</del><ins>+ inside.fadeIn( 'fast', complete );
</ins><span class="cx"> } else {
</span><span class="cx"> inside.slideDown( 'fast', complete );
</span><span class="cx"> }
</span><ins>+ control.container.trigger( 'expand' );
+ control.container.addClass( 'expanding' );
</ins><span class="cx"> } else {
</span><span class="cx"> control.container.trigger( 'collapse' );
</span><span class="cx"> control.container.addClass( 'collapsing' );
</span><span class="lines">@@ -1405,7 +1412,7 @@
</span><span class="cx"> control.container.trigger( 'collapsed' );
</span><span class="cx"> };
</span><span class="cx"> if ( control.params.is_wide ) {
</span><del>- inside.animate( { width: 'hide' }, 'fast', complete );
</del><ins>+ inside.fadeOut( 'fast', complete );
</ins><span class="cx"> } else {
</span><span class="cx"> inside.slideUp( 'fast', function() {
</span><span class="cx"> widget.css( { width:'', margin:'' } );
</span></span></pre>
</div>
</div>
</body>
</html>