Merge "resourceloader: Move mw.libs and mw.widgets from startup to mediawiki.base"

diff --git a/resources/src/mediawiki.base/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js
index 00a74fe..4c8880c 100644 (file)
--- a/resources/src/mediawiki.base/mediawiki.base.js
+++ b/resources/src/mediawiki.base/mediawiki.base.js
@@ -236,6 +236,18 @@
         * @singleton
         */
 
+       /**
+        * Empty object for third-party libraries, for cases where you don't
+        * want to add a new global, or the global is bad and needs containment
+        * or wrapping.
+        *
+        * @property
+        */
+       mw.libs = {};
+
+       // OOUI widgets specific to MediaWiki
+       mw.widgets = {};
+
        /**
         * @inheritdoc mw.inspect#runReports
         * @method

diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index 95d2d7f..ad05c6f 100644 (file)
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -429,15 +429,6 @@
                 */
                config: new Map( $VARS.wgLegacyJavaScriptGlobals ),
 
-               /**
-                * Empty object for third-party libraries, for cases where you don't
-                * want to add a new global, or the global is bad and needs containment
-                * or wrapping.
-                *
-                * @property
-                */
-               libs: {},
-
                /**
                 * Store for messages.
                 *
@@ -2472,10 +2463,7 @@
                         * @property {mw.Map}
                         */
                        tokens: new Map()
-               },
-
-               // OOUI widgets specific to MediaWiki
-               widgets: {}
+               }
 
        };