WordPress.org

Make WordPress Core

Changeset 20890


Ignore:
Timestamp:
05/24/2012 10:45:27 PM (8 years ago)
Author:
koopersmith
Message:

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

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/js/customize-loader.dev.js

    r20886 r20890  
    4141                this.window.on( 'popstate', Loader.popstate );
    4242
    43             if ( $.support.hashchange )
     43            if ( $.support.hashchange ) {
    4444                this.window.on( 'hashchange', Loader.hashchange );
     45                this.window.triggerHandler( 'hashchange' );
     46            }
    4547        },
    4648
     
    5759
    5860            if ( hash && 0 === hash.indexOf( 'customize=on' ) )
    59                 Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
     61                Loader.open( Loader.settings.url + '?' + hash );
    6062
    6163            if ( ! hash && ! $.support.history )
     
    98100                history.pushState( { customize: src }, '', src );
    99101            else if ( ! $.support.history && $.support.hashchange && hash )
    100                 window.location.hash = hash;
     102                window.location.hash = 'customize=on&' + hash;
    101103
    102104            this.trigger( 'open' );
  • trunk/wp-includes/theme.php

    r20886 r20890  
    15971597
    15981598    $settings = array(
    1599         'url'           => esc_url( admin_url( 'admin.php' ) ),
     1599        'url'           => esc_url( admin_url( 'customize.php' ) ),
    16001600        'isCrossDomain' => $cross_domain,
    16011601    );
Note: See TracChangeset for help on using the changeset viewer.