Merge "SpecialListgrouprights: Fix "Namespace restrictions" header ID"

[lhc/web/wiklou.git] / resources / src / startup.js

diff --git a/resources/src/startup.js b/resources/src/startup.js
index e0df772..b0c1578 100644 (file)
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -5,21 +5,19 @@
  * - Beware: Do not call mwNow before the isCompatible() check.
  */
 
-/* global mw, $VARS, $CODE */
-
-var mwPerformance = ( window.performance && performance.mark ) ? performance : {
-               mark: function () {}
-       },
-       // Define now() here to ensure valid comparison with mediaWikiLoadEnd (T153819).
-       mwNow = ( function () {
-               var perf = window.performance,
-                       navStart = perf && perf.timing && perf.timing.navigationStart;
-               return navStart && typeof perf.now === 'function' ?
-                       function () { return navStart + perf.now(); } :
-                       function () { return Date.now(); };
-       }() ),
-       // eslint-disable-next-line no-unused-vars
-       mediaWikiLoadStart;
+/* global mw, mwPerformance, mwNow, isCompatible, $VARS, $CODE */
+
+window.mwPerformance = ( window.performance && performance.mark ) ? performance : {
+       mark: function () {}
+};
+// Define now() here to ensure valid comparison with mediaWikiLoadEnd (T153819).
+window.mwNow = ( function () {
+       var perf = window.performance,
+               navStart = perf && perf.timing && perf.timing.navigationStart;
+       return navStart && typeof perf.now === 'function' ?
+               function () { return navStart + perf.now(); } :
+               function () { return Date.now(); };
+}() );
 
 /**
  * See <https://www.mediawiki.org/wiki/Compatibility#Browsers>
@@ -35,7 +33,7 @@ var mwPerformance = ( window.performance && performance.mark ) ? performance : {
  * - IE 10+
  * - Firefox 4+
  * - Safari 5+
- * - Opera 12.10+
+ * - Opera 15+
  * - Mobile Safari 5.1+ (iOS 5+)
  * - Android 4.1+
  *
@@ -44,7 +42,7 @@ var mwPerformance = ( window.performance && performance.mark ) ? performance : {
  * - IE 6+
  * - Firefox 3+
  * - Safari 3+
- * - Opera 10+
+ * - Opera 15+
  * - Mobile Safari 5.0+ (iOS 4+)
  * - Android 2.0+
  * - WebOS < 1.5
@@ -62,7 +60,7 @@ var mwPerformance = ( window.performance && performance.mark ) ? performance : {
  * @param {string} [str] User agent, defaults to navigator.userAgent
  * @return {boolean} User agent is compatible with MediaWiki JS
  */
-function isCompatible( str ) {
+window.isCompatible = function ( str ) {
        var ua = str || navigator.userAgent;
        return !!(
                // http://caniuse.com/#feat=es5
@@ -92,7 +90,7 @@ function isCompatible( str ) {
                        ua.match( /PlayStation/i )
                )
        );
-}
+};
 
 // Conditional script injection
 ( function () {
@@ -152,19 +150,17 @@ function isCompatible( str ) {
                };
        }
 
-       mediaWikiLoadStart = mwNow();
+       window.mediaWikiLoadStart = mwNow();
        mwPerformance.mark( 'mwLoadStart' );
 
        script = document.createElement( 'script' );
        script.src = $VARS.baseModulesUri;
-       script.onload = script.onreadystatechange = function () {
-               if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-                       // Clean up
-                       script.onload = script.onreadystatechange = null;
-                       script = null;
-                       // Callback
-                       startUp();
-               }
+       script.onload = function () {
+               // Clean up
+               script.onload = null;
+               script = null;
+               // Callback
+               startUp();
        };
        document.getElementsByTagName( 'head' )[ 0 ].appendChild( script );
 }() );