Changeset 20737

Timestamp:

05/07/2012 08:03:39 PM (12 years ago)

Author:

koopersmith

Message:

Theme Customizer: Use a internal global _wpCustomizeSettings object for wp.customize.settings to prevent script race conditions in IE (which blocked interaction with the preview). see #20582, #19910.

Location:

trunk/wp-includes

Files:

• class-wp-customize.php (modified) (1 diff)
• customize-controls.php (modified) (1 diff)
• js/customize-controls.dev.js (modified) (1 diff)
• js/customize-preview.dev.js (modified) (1 diff)

trunk/wp-includes/class-wp-customize.php

@@ -210 +210 @@
         ?>
         <script type="text/javascript">
-            (function() {
-                if ( typeof wp === 'undefined' || ! wp.customize )
-                    return;
-
-                wp.customize.settings = <?php echo json_encode( $settings ); ?>;
-            })();
+            var _wpCustomizeSettings = <?php echo json_encode( $settings ); ?>;
         </script>
         <?php

trunk/wp-includes/customize-controls.php

@@ -116 +116 @@
     ?>
     <script type="text/javascript">
-        (function() {
-            if ( typeof wp === 'undefined' || ! wp.customize )
-                return;
-
-            wp.customize.settings = <?php echo json_encode( $settings ); ?>;
-        })();
+        var _wpCustomizeSettings = <?php echo json_encode( $settings ); ?>;
     </script>
 </body>

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

@@ -367 +367 @@
 
     $( function() {
+        api.settings = window._wpCustomizeSettings;
         if ( ! api.settings )
             return;

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

@@ -32 +32 @@
 
     $( function() {
+        api.settings = window._wpCustomizeSettings;
         if ( ! api.settings )
             return;