<!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>[20899] trunk: Theme Customizer: Improve activate and publish flow, make customizer states easier to track.</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/20899">20899</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-25 17:42:06 +0000 (Fri, 25 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Improve activate and publish flow, make customizer states easier to track. fixes <a href="http://core.trac.wordpress.org/ticket/20743">#20743</a>, see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomizephp">trunk/wp-admin/customize.php</a></li>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/customize.php (20898 => 20899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/customize.php 2012-05-25 16:58:23 UTC (rev 20898)
+++ trunk/wp-admin/customize.php 2012-05-25 17:42:06 UTC (rev 20899)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> 'url' => array(
</span><span class="cx"> 'preview' => esc_url( home_url( '/' ) ),
</span><span class="cx"> 'parent' => esc_url( admin_url() ),
</span><ins>+ 'activated' => esc_url( admin_url( 'themes.php?activated=true' ) ),
</ins><span class="cx"> 'ajax' => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),
</span><span class="cx"> 'allowed' => array_map( 'esc_url', $allowed_urls ),
</span><span class="cx"> 'isCrossDomain' => $cross_domain,
</span></span></pre></div>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (20898 => 20899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2012-05-25 16:58:23 UTC (rev 20898)
+++ trunk/wp-admin/js/theme.dev.js 2012-05-25 17:42:06 UTC (rev 20899)
</span><span class="lines">@@ -19,35 +19,6 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Theme Customizer
- *
- * Ensures the themes page is refreshed if the customizer switches the theme.
- */
-jQuery( function($) {
- var Loader, activated;
-
- if ( typeof wp === 'undefined' || ! wp.customize || ! ( Loader = wp.customize.Loader ) )
- return;
-
- // Strip the current URL of its query string and hash, add activated query string.
- activated = window.location.href.replace(/[#?].*$/, '') + '?activated=true';
-
- // When an instance of the customizer is loaded...
- Loader.bind( 'open', function() {
-
- // If the customizer triggers a theme switched event,
- // load the activated page when the customizer is closed.
- Loader.messenger.bind( 'switched', function() {
-
- Loader.unbind( 'close', Loader.overlay.hide );
- Loader.bind( 'close', function() {
- window.location = activated;
- });
- });
- });
-});
-
-/**
</del><span class="cx"> * Theme Install
</span><span class="cx"> *
</span><span class="cx"> * Displays theme previews on theme install pages.
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20898 => 20899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-05-25 16:58:23 UTC (rev 20898)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-05-25 17:42:06 UTC (rev 20899)
</span><span class="lines">@@ -439,13 +439,14 @@
</span><span class="cx"> api.settings = window._wpCustomizeSettings;
</span><span class="cx"> api.l10n = window._wpCustomizeControlsL10n;
</span><span class="cx">
</span><ins>+ // Check if we can run the customizer.
</ins><span class="cx"> if ( ! api.settings )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Redirect to the fallback preview if any incompatibilities are found.
</ins><span class="cx"> if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) )
</span><span class="cx"> return window.location = api.settings.url.fallback;
</span><span class="cx">
</span><del>- // Initialize Previewer
</del><span class="cx"> var body = $( document.body ),
</span><span class="cx"> query, previewer, parent;
</span><span class="cx">
</span><span class="lines">@@ -455,6 +456,7 @@
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Initialize Previewer
</ins><span class="cx"> previewer = new api.Previewer({
</span><span class="cx"> container: '#customize-preview',
</span><span class="cx"> form: '#customize-controls',
</span><span class="lines">@@ -481,9 +483,14 @@
</span><span class="cx"> api.trigger( 'save', request );
</span><span class="cx">
</span><span class="cx"> body.addClass('saving');
</span><ins>+
</ins><span class="cx"> request.always( function() {
</span><span class="cx"> body.removeClass('saving');
</span><span class="cx"> });
</span><ins>+
+ request.done( function() {
+ api.trigger( 'saved' );
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -507,6 +514,57 @@
</span><span class="cx"> // Load the preview frame.
</span><span class="cx"> previewer.refresh();
</span><span class="cx">
</span><ins>+ // Save and activated states
+ (function() {
+ var state = new api.Values(),
+ saved = state.create('saved'),
+ activated = state.create('activated');
+
+ state.bind( 'change', function() {
+ var save = $('#save'),
+ back = $('.back');
+
+ if ( ! activated() ) {
+ save.val( api.l10n.activate ).prop( 'disabled', false );
+ back.text( api.l10n.cancel );
+
+ } else if ( saved() ) {
+ save.val( api.l10n.saved ).prop( 'disabled', true );
+ back.text( api.l10n.close );
+
+ } else {
+ save.val( api.l10n.save ).prop( 'disabled', false );
+ back.text( api.l10n.cancel );
+ }
+ });
+
+ // Set default states.
+ saved( true );
+ activated( api.settings.theme.active );
+
+ api.bind( 'change', function() {
+ state('saved').set( false );
+ });
+
+ api.bind( 'saved', function() {
+ state('saved').set( true );
+ state('activated').set( true );
+ });
+
+ activated.bind( function( to ) {
+ if ( to )
+ api.trigger( 'activated' );
+ });
+
+ // Expose states to the API.
+ api.state = state;
+ }());
+
+ api.bind( 'activated', function() {
+ if ( api.settings.url.activated )
+ window.location = api.settings.url.activated;
+ });
+
</ins><span class="cx"> // Temporary accordion code.
</span><span class="cx"> $('.customize-section-title').click( function() {
</span><span class="cx"> var clicked = $( this ).parents( '.customize-section' );
</span><span class="lines">@@ -538,20 +596,12 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // If the current theme isn't active, it will be activated on save,
- // rendering the previous page
- api.bind( 'save', function( request ) {
- request.done( function() {
- parent.send( 'saved' );
-
- if ( ! api.settings.theme.active ) {
- parent.send( 'switched' );
- $('#save').val( api.l10n.save );
- }
-
- api.settings.theme.active = true;
</del><ins>+ // Pass events through to the parent.
+ $.each([ 'saved', 'activated' ], function( i, id ) {
+ api.bind( id, function() {
+ parent.send( id );
</ins><span class="cx"> });
</span><del>- } );
</del><ins>+ });
</ins><span class="cx">
</span><span class="cx"> // Initialize the connection with the parent frame.
</span><span class="cx"> parent.send( 'ready' );
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (20898 => 20899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-05-25 16:58:23 UTC (rev 20898)
+++ trunk/wp-includes/script-loader.php 2012-05-25 17:42:06 UTC (rev 20899)
</span><span class="lines">@@ -302,7 +302,11 @@
</span><span class="cx"> $scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'customize-base' ), false, 1 );
</span><span class="cx"> $scripts->add( 'customize-controls', "/wp-includes/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
</span><span class="cx"> $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
</span><del>- 'save' => __( 'Save &amp; Publish' ),
</del><ins>+ 'activate' => __( 'Save &amp; Activate' ),
+ 'save' => __( 'Save &amp; Publish' ),
+ 'saved' => __( 'Saved' ),
+ 'cancel' => __( 'Cancel' ),
+ 'close' => __( 'Close' ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( is_admin() ) {
</span></span></pre>
</div>
</div>
</body>
</html>