Changeset 20488

Timestamp:

04/16/2012 11:07:23 PM (12 years ago)

Author:

koopersmith

Message:

Theme Customizer: Integrate with browser history. Use window.history by default, with window.onhashchange as a fallback. fixes #20337, see #19910.

Location:

trunk/wp-includes

Files:

• js/customize-loader.dev.js (modified) (4 diffs)
• theme.php (modified) (1 diff)

trunk/wp-includes/js/customize-loader.dev.js

@@ -7 +7 @@
 
     Loader = {
+        supports: {
+            history:  !! ( window.history && history.pushState ),
+            hashchange: ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7)
+        },
+
         initialize: function() {
-            this.body      = $( document.body ).addClass('customize-support');
-            this.element   = $( '<div id="customize-container" class="wp-full-overlay" />' ).appendTo( this.body );
+            this.body    = $( document.body ).addClass('customize-support');
+            this.window  = $( window );
+            this.element = $( '<div id="customize-container" class="wp-full-overlay" />' ).appendTo( this.body );
 
             $('#wpbody').on( 'click', '.load-customize', function( event ) {
@@ -17 +23 @@
                 Loader.open( $(this).attr('href') );
             });
+
+            // Add navigation listeners.
+            if ( this.supports.history )
+                this.window.on( 'popstate', Loader.popstate );
+
+            if ( this.supports.hashchange )
+                this.window.on( 'hashchange', Loader.hashchange );
+        },
+        popstate: function( e ) {
+            var state = e.originalEvent.state;
+            if ( state && state.customize )
+                Loader.open( state.customize );
+            else if ( Loader.active )
+                Loader.close();
+        },
+        hashchange: function( e ) {
+            var hash = window.location.toString().split('#')[1];
+
+            if ( hash && 0 === hash.indexOf( 'customize=on' ) )
+                Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
+
+            if ( ! hash )
+                Loader.close();
         },
         open: function( src ) {
+            if ( this.active )
+                return;
+            this.active = true;
+
             this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
 
@@ -30 +63 @@
 
             this.messenger.bind( 'close', function() {
-                Loader.close();
+                if ( Loader.supports.history )
+                    history.back();
+                else if ( Loader.supports.hashchange )
+                    window.location.hash = '';
+                else
+                    Loader.close();
             });
 
             this.element.fadeIn( 200, function() {
+                var hash = src.split('?')[1];
+
                 Loader.body.addClass( 'customize-active full-overlay-active' );
+
+                // Ensure we don't call pushState if the user hit the forward button.
+                if ( Loader.supports.history && window.location.href !== src )
+                    history.pushState( { customize: src }, '', src );
+                else if ( Loader.supports.hashchange && hash )
+                    window.location.hash = hash;
             });
         },
         close: function() {
+            if ( ! this.active )
+                return;
+            this.active = false;
+
             this.element.fadeOut( 200, function() {
                 Loader.iframe.remove();
@@ -48 +98 @@
 
     $( function() {
-        if ( !! window.postMessage )
+        if ( window.postMessage )
             Loader.initialize();
     });

trunk/wp-includes/theme.php

@@ -1591 +1591 @@
     wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', array(
         'back' => sprintf( __( '← Return to %s' ), get_admin_page_title() ),
+        'url'  => admin_url( 'admin.php' ),
     ) );
 }