Changeset 20886 for trunk/wp-includes/theme.php

Timestamp:

05/24/2012 09:13:21 PM (13 years ago)

Author:

koopersmith

Message:

Theme Customizer: Check for CORS support when the preview and admin urls are cross-domain. Add a fallback to the customize control frame, and check support there as well. see #20582, #19910.

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -1585 +1585 @@
 
 /**
- * Localizes the customize-loader script.
+ * Adds settings for the customize-loader script.
  *
  * @since 3.4.0
  */
-function _wp_customize_loader_localize() {
-    wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', array(
-        'url' => admin_url( 'admin.php' ),
-    ) );
-}
-add_action( 'admin_enqueue_scripts', '_wp_customize_loader_localize' );
+function _wp_customize_loader_settings() {
+    global $wp_scripts;
+
+    $admin_origin = parse_url( admin_url() );
+    $home_origin  = parse_url( home_url() );
+    $cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+
+    $settings = array(
+        'url'           => esc_url( admin_url( 'admin.php' ) ),
+        'isCrossDomain' => $cross_domain,
+    );
+
+    $script = 'var _wpCustomizeLoaderSettings = ' . json_encode( $settings ) . ';';
+
+    $data = $wp_scripts->get_data( 'customize-loader', 'data' );
+    if ( $data )
+        $script = "$data\n$script";
+
+    $wp_scripts->add_data( 'customize-loader', 'data', $script );
+}
+add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
 
 /**