Improve the lazy instantiation of the 'wp' JavaScript variable. props…

… evansolomon, fixes #22113. git-svn-id: http://core.svn.wordpress.org/trunk@22126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
stonyhill · Oct 6, 2012 · 1baac22 · 1baac22
1 parent 4220ed4
commit 1baac22
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/wp-includes/js/customize-base.js b/wp-includes/js/customize-base.js
@@ -1,5 +1,4 @@
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 (function( exports, $ ){
 	var api, extend, ctor, inherits,

diff --git a/wp-includes/js/customize-loader.js b/wp-includes/js/customize-loader.js
@@ -1,5 +1,4 @@
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 (function( exports, $ ){
 	var api = wp.customize,

diff --git a/wp-includes/js/mce-view.js b/wp-includes/js/mce-view.js
@@ -1,6 +1,5 @@
 // Ensure the global `wp` object exists.
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 // HTML utility functions
 // ----------------------

diff --git a/wp-includes/js/media-models.js b/wp-includes/js/media-models.js
@@ -1,5 +1,4 @@
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 (function($){
 	var Attachment, Attachments, Query, compare;

diff --git a/wp-includes/js/plupload/wp-plupload.js b/wp-includes/js/plupload/wp-plupload.js
@@ -1,5 +1,4 @@
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 (function( exports, $ ) {
 	var Uploader;

diff --git a/wp-includes/js/shortcode.js b/wp-includes/js/shortcode.js
@@ -1,8 +1,7 @@
 // Utility functions for parsing and handling shortcodes in Javascript.
 
 // Ensure the global `wp` object exists.
-if ( typeof wp === 'undefined' )
-	var wp = {};
+window.wp = window.wp || {};
 
 (function(){
 	wp.shortcode = {