From: Ori.livneh <ori@wikimedia.org>
Date: Wed, 11 Dec 2013 00:59:19 +0000 (+0000)
Subject: Revert "Module storage: randomly choose between Function and $.globalEval"
X-Git-Tag: 1.31.0-rc.0~17678
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=ca8d573ebecaad6aebb43f934e0d96f6606481a3;p=lhc%2Fweb%2Fwiklou.git

Revert "Module storage: randomly choose between Function and $.globalEval"

Did not get a chance to deploy this.

This reverts commit a20333cc4da04775db04b33407c88b4ccb5e5e74.

Change-Id: I6937d54897477f1942a8a9c312324a39d2a3868d
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 840a071514..724ca5e814 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -1269,12 +1269,7 @@ var mw = ( function ( $, undefined ) {
 							}
 							return true;
 						} );
-						if ( mw.loader.store.useFunction ) {
-							/* jshint -W054 */
-							new Function( concatSource.join( ';' ) )();
-						} else {
-							$.globalEval( concatSource.join( ';' ) );
-						}
+						$.globalEval( concatSource.join( ';' ) );
 					}
 
 					// Early exit if there's nothing to load...
@@ -1821,7 +1816,6 @@ var mw = ( function ( $, undefined ) {
 							raw = localStorage.getItem( mw.loader.store.getStoreKey() );
 							// If we get here, localStorage is available; mark enabled.
 							mw.loader.store.enabled = true;
-							mw.loader.store.useFunction = !!Math.floor( Math.random() * 2 );
 							data = JSON.parse( raw );
 							if ( data && typeof data.items === 'object' && data.vary === mw.loader.store.getVary() ) {
 								mw.loader.store.items = data.items;