<!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>[20352] trunk: Theme Customizer: Improve the customize loader and themes list table markup.</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, #logmsg > ol { margin-left: 0; 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/20352">20352</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-04 21:02:29 +0000 (Wed, 04 Apr 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Theme Customizer: Improve the customize loader and themes list table markup. see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.

* Use event delegation for triggering the customize loader (so we play nicely with infinite scroll).
* Use data attributes on .load-customize links instead of parsing the href.
* Properly translate the 'Customize' string instead of injecting the replacement with JS.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunkwpincludesjscustomizeloaderdevjs">trunk/wp-includes/js/customize-loader.dev.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (20351 => 20352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php        2012-04-04 20:11:21 UTC (rev 20351)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php        2012-04-04 21:02:29 UTC (rev 20352)
</span><span class="lines">@@ -131,11 +131,15 @@
</span><span class="cx">                                 array( 'preview' =&gt; 1, 'template' =&gt; $template, 'stylesheet' =&gt; $stylesheet, 'preview_iframe' =&gt; true, 'TB_iframe' =&gt; 'true' ),
</span><span class="cx">                                 home_url( '/' ) ) );
</span><span class="cx"> 
</span><ins>+                        $customize_attributes = 'title=&quot;' . esc_attr( sprintf( __( 'Customize &amp;#8220;%s&amp;#8221;' ), $title ) ) . '&quot;
+                                . data-customize-template=&quot;' . esc_attr( $template ) . '&quot; data-customize-stylesheet=&quot;' . esc_attr( $stylesheet ) . '&quot;';
+
</ins><span class="cx">                         $actions = array();
</span><span class="cx">                         $actions[] = '&lt;a href=&quot;' . $activate_link . '&quot; class=&quot;activatelink&quot; title=&quot;'
</span><span class="cx">                                 . esc_attr( sprintf( __( 'Activate &amp;#8220;%s&amp;#8221;' ), $title ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;';
</span><del>-                        $actions[] = '&lt;a href=&quot;' . $preview_link . '&quot; class=&quot;thickbox thickbox-preview&quot; title=&quot;'
-                                . esc_attr( sprintf( __( 'Preview &amp;#8220;%s&amp;#8221;' ), $title ) ) . '&quot;&gt;' . __( 'Preview' ) . '&lt;/a&gt;';
</del><ins>+                        $actions[] = '&lt;a href=&quot;' . $preview_link . '&quot; class=&quot;hide-if-js&quot; title=&quot;'
+                                . esc_attr( sprintf( __( 'Preview &amp;#8220;%s&amp;#8221;' ), $title ) ) . '&quot;&gt;' . __( 'Preview' ) . '&lt;/a&gt;'
+                                . '&lt;a href=&quot;#&quot; class=&quot;load-customize hide-if-no-js&quot; ' . $customize_attributes . '&gt;' . __( 'Customize' ) . '&lt;/a&gt;';
</ins><span class="cx">                         if ( ! is_multisite() &amp;&amp; current_user_can( 'delete_themes' ) )
</span><span class="cx">                                 $actions[] = '&lt;a class=&quot;submitdelete deletion&quot; href=&quot;' . wp_nonce_url( &quot;themes.php?action=delete&amp;amp;template=$stylesheet&quot;, 'delete-theme_' . $stylesheet )
</span><span class="cx">                                         . '&quot; onclick=&quot;' . &quot;return confirm( '&quot; . esc_js( sprintf( __( &quot;You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete.&quot; ), $title ) )
</span><span class="lines">@@ -145,7 +149,7 @@
</span><span class="cx"> 
</span><span class="cx">                         $actions = implode ( ' | ', $actions );
</span><span class="cx">                         ?&gt;
</span><del>-                        &lt;a href=&quot;&lt;?php echo $preview_link; ?&gt;&quot; class=&quot;thickbox thickbox-preview screenshot&quot;&gt;
</del><ins>+                        &lt;a href=&quot;&lt;?php echo $preview_link; ?&gt;&quot; class=&quot;load-customize screenshot&quot; &lt;?php echo $customize_attributes; ?&gt;&gt;
</ins><span class="cx">                         &lt;?php if ( $screenshot = $theme-&gt;get_screenshot() ) : ?&gt;
</span><span class="cx">                                 &lt;img src=&quot;&lt;?php echo esc_url( $screenshot ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span></span></pre></div>
<a id="trunkwpincludesjscustomizeloaderdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-loader.dev.js (20351 => 20352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-loader.dev.js        2012-04-04 20:11:21 UTC (rev 20351)
+++ trunk/wp-includes/js/customize-loader.dev.js        2012-04-04 21:02:29 UTC (rev 20352)
</span><span class="lines">@@ -41,27 +41,17 @@
</span><span class="cx">         $( function() {
</span><span class="cx">                 Loader.initialize();
</span><span class="cx"> 
</span><del>-                // Override 'preview' links on themes page.
-                $('.thickbox-preview').click( function( event ) {
-                        var href, template, stylesheet;
</del><ins>+                $('#current-theme, #availablethemes').on( 'click', '.load-customize', function( event ) {
+                        var load = $(this);
</ins><span class="cx"> 
</span><del>-                        // Stop the thickbox.
</del><span class="cx">                         event.preventDefault();
</span><del>-                        event.stopImmediatePropagation();
</del><span class="cx"> 
</span><del>-                        // Extract the template/stylesheet from the preview link's url.
-                        href = $(this).attr('href');
-                        template = href.match('template=([^&amp;]*)')[1];
-                        stylesheet = href.match('stylesheet=([^&amp;]*)')[1];
-
</del><span class="cx">                         // Load the theme.
</span><span class="cx">                         Loader.open({
</span><del>-                                template: template,
-                                stylesheet: stylesheet
</del><ins>+                                template:   load.data('customizeTemplate'),
+                                stylesheet: load.data('customizeStylesheet')
</ins><span class="cx">                         });
</span><del>-                }).filter( function() {
-                        return 'Preview' == $(this).text();
-                }).text('Customize');
</del><ins>+                });
</ins><span class="cx">         });
</span><span class="cx"> 
</span><span class="cx">         // Expose the API to the world.
</span></span></pre>
</div>
</div>

</body>
</html>