Changeset 20890

Timestamp:

05/24/2012 10:45:27 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Fix hash-based loader fallbacks. see #20736, #19910, [20886].

Location:

trunk/wp-includes

Files:

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

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

@@ -41 +41 @@
                 this.window.on( 'popstate', Loader.popstate );
 
-            if ( $.support.hashchange )
+            if ( $.support.hashchange ) {
                 this.window.on( 'hashchange', Loader.hashchange );
+                this.window.triggerHandler( 'hashchange' );
+            }
         },
 
@@ -57 +59 @@
 
             if ( hash && 0 === hash.indexOf( 'customize=on' ) )
-                Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
+                Loader.open( Loader.settings.url + '?' + hash );
 
             if ( ! hash && ! $.support.history )
@@ -98 +100 @@
                 history.pushState( { customize: src }, '', src );
             else if ( ! $.support.history && $.support.hashchange && hash )
-                window.location.hash = hash;
+                window.location.hash = 'customize=on&' + hash;
 
             this.trigger( 'open' );

trunk/wp-includes/theme.php

@@ -1597 +1597 @@
 
     $settings = array(
-        'url'           => esc_url( admin_url( 'admin.php' ) ),
+        'url'           => esc_url( admin_url( 'customize.php' ) ),
         'isCrossDomain' => $cross_domain,
     );