<!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>[32088] trunk/src: Customizer Theme Switcher: Lazy load theme screenshots.</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/32088">32088</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/32088","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-08 20:51:39 +0000 (Wed, 08 Apr 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'>Customizer Theme Switcher: Lazy load theme screenshots.
props westonruter, ocean90.
fixes <a href="https://core.trac.wordpress.org/ticket/31793">#31793</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-04-08 19:02:57 UTC (rev 32087)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-04-08 20:51:39 UTC (rev 32088)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,6 +552,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> currentTheme: '',
</span><span class="cx" style="display: block; padding: 0 10px"> overlay: '',
</span><span class="cx" style="display: block; padding: 0 10px"> template: '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ screenshotQueue: null,
+ $window: $( window ),
+ $customizeSidebar: $( '.wp-full-overlay-sidebar-content:first' ),
</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"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,6 +585,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> section.closeDetails();
</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">+
+ _.bindAll( this, 'renderScreenshots' );
</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">@@ -650,6 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> section.closeDetails();
</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">+ var renderScreenshots = _.throttle( _.bind( section.renderScreenshots, this ), 100 );
</ins><span class="cx" style="display: block; padding: 0 10px"> section.container.on( 'input', '#themes-filter', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var count,
</span><span class="cx" style="display: block; padding: 0 10px"> term = event.currentTarget.value.toLowerCase().trim().replace( '-', ' ' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -659,10 +665,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> control.filter( term );
</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">+ renderScreenshots();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Update theme count.
</span><span class="cx" style="display: block; padding: 0 10px"> count = section.container.find( 'li.customize-control:visible' ).length;
</span><span class="cx" style="display: block; padding: 0 10px"> section.container.find( '.theme-count' ).text( count );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Pre-load the first 3 theme screenshots.
+ api.bind( 'ready', function () {
+ _.each( section.controls().slice( 0, 3 ), function ( control ) {
+ var img, src = control.params.theme.screenshot[0];
+ if ( src ) {
+ img = new Image();
+ img.src = src;
+ }
+ });
+ });
</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">@@ -706,9 +725,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"> api.panel.each( function ( otherPanel ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( panel !== otherPanel ) {
- otherPanel.collapse( { duration: 0 } );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ otherPanel.collapse( { duration: 0 } );
</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"> content.show( 0, function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,6 +735,8 @@
</span><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-themes-panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.delay( panel.renderScreenshots, 10 ); // Wait for the controls
+ panel.$customizeSidebar.on( 'scroll.customize-themes-section', _.throttle( panel.renderScreenshots, 300 ) );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,6 +748,7 @@
</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="cx" style="display: block; padding: 0 10px"> overlay.removeClass( 'in-themes-panel' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ panel.$customizeSidebar.off( 'scroll.customize-themes-section' );
</ins><span class="cx" style="display: block; padding: 0 10px"> content.delay( 180 ).hide( 0, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> content.css( 'margin-top', 'inherit' ); // Reset
</span><span class="cx" style="display: block; padding: 0 10px"> if ( args.completeCallback ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,6 +763,54 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Render control's screenshot if the control comes into view.
+ *
+ * @since 4.2.0
+ */
+ renderScreenshots: function( ) {
+ var section = this;
+
+ // Fill queue initially.
+ if ( section.screenshotQueue === null ) {
+ section.screenshotQueue = section.controls();
+ }
+
+ // Are all screenshots rendered?
+ if ( ! section.screenshotQueue.length ) {
+ return;
+ }
+
+ section.screenshotQueue = _.filter( section.screenshotQueue, function( control ) {
+ var $imageWrapper = control.container.find( '.theme-screenshot' ),
+ $image = $imageWrapper.find( 'img' );
+
+ if ( ! $image.length ) {
+ return false;
+ }
+
+ if ( $image.is( ':hidden' ) ) {
+ return true;
+ }
+
+ // Based on unveil.js.
+ var wt = section.$window.scrollTop(),
+ wb = wt + section.$window.height(),
+ et = $image.offset().top,
+ ih = $imageWrapper.height(),
+ eb = et + ih,
+ threshold = ih * 3,
+ inView = eb >= wt - threshold && et <= wb + threshold;
+
+ if ( inView ) {
+ control.container.trigger( 'render-screenshot' );
+ }
+
+ // If the image is in view return false so it's cleared from the queue.
+ return ! inView;
+ } );
+ },
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Advance the modal to the next theme.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,8 +900,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> callback = callback || function(){};
</span><span class="cx" style="display: block; padding: 0 10px"> section.currentTheme = theme.id;
</span><span class="cx" style="display: block; padding: 0 10px"> section.overlay.html( section.template( theme ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .fadeIn( 'fast' )
- .focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .fadeIn( 'fast' )
+ .focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> section.containFocus( section.overlay );
</span><span class="cx" style="display: block; padding: 0 10px"> section.updateLimits();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1497,7 +1565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.params.attachment = this.params.defaultAttachment;
</span><span class="cx" style="display: block; padding: 0 10px"> this.setting( this.params.defaultAttachment.url );
</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">+ },
</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"> * Called when the "Remove" link is clicked. Empties the setting.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1916,6 +1984,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> api.section( control.section() ).showDetails( control.params.theme );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ control.container.on( 'render-screenshot', function() {
+ var $screenshot = $( this ).find( 'img' ),
+ source = $screenshot.data( 'src' );
+
+ if ( source ) {
+ $screenshot.attr( 'src', source );
+ }
+ });
</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">@@ -1925,10 +2002,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> filter: function( term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var control = this,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- haystack = control.params.theme.name + ' ' +
- control.params.theme.description + ' ' +
- control.params.theme.tags + ' ' +
- control.params.theme.author;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ haystack = control.params.theme.name + ' ' +
+ control.params.theme.description + ' ' +
+ control.params.theme.tags + ' ' +
+ control.params.theme.author;
</ins><span class="cx" style="display: block; padding: 0 10px"> haystack = haystack.toLowerCase().replace( '-', ' ' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== haystack.search( term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> control.activate();
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2015-04-08 19:02:57 UTC (rev 32087)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-04-08 20:51:39 UTC (rev 32088)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1248,7 +1248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.theme.screenshot[0] ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-screenshot">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="{{ data.theme.screenshot[0] }}" alt="" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img data-src="{{ data.theme.screenshot[0] }}" alt="" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-screenshot blank"></div>
</span></span></pre>
</div>
</div>
</body>
</html>