From 13628d918684fc74538028c3bc94559428abf735 Mon Sep 17 00:00:00 2001
From: koopersmith <koopersmith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 7 May 2012 20:03:39 +0000
Subject: [PATCH] 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.

git-svn-id: http://core.svn.wordpress.org/trunk@20737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize.php       | 7 +------
 wp-includes/customize-controls.php       | 7 +------
 wp-includes/js/customize-controls.dev.js | 1 +
 wp-includes/js/customize-preview.dev.js  | 1 +
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/wp-includes/class-wp-customize.php b/wp-includes/class-wp-customize.php
index 6b8230eb0..b0758111b 100644
--- a/wp-includes/class-wp-customize.php
+++ b/wp-includes/class-wp-customize.php
@@ -209,12 +209,7 @@ final class WP_Customize {
 
 		?>
 		<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
 	}
diff --git a/wp-includes/customize-controls.php b/wp-includes/customize-controls.php
index 0e562298a..9eb024961 100644
--- a/wp-includes/customize-controls.php
+++ b/wp-includes/customize-controls.php
@@ -115,12 +115,7 @@ do_action( 'customize_controls_print_scripts' );
 
 	?>
 	<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>
 </html>
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index f405a87d6..e77175602 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -366,6 +366,7 @@
 	};
 
 	$( function() {
+		api.settings = window._wpCustomizeSettings;
 		if ( ! api.settings )
 			return;
 
diff --git a/wp-includes/js/customize-preview.dev.js b/wp-includes/js/customize-preview.dev.js
index 89adb9633..393e593b8 100644
--- a/wp-includes/js/customize-preview.dev.js
+++ b/wp-includes/js/customize-preview.dev.js
@@ -31,6 +31,7 @@
 	});
 
 	$( function() {
+		api.settings = window._wpCustomizeSettings;
 		if ( ! api.settings )
 			return;