Merge "exception: Add missing early return for UserNotLoggedIn error page"

[lhc/web/wiklou.git] / resources / src / mediawiki.base / mediawiki.base.js

diff --git a/resources/src/mediawiki.base/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js
index 00a74fe..415cabd 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
@@ -699,6 +711,22 @@
                        } );
        };
 
+       // Skeleton user object, extended by the 'mediawiki.user' module.
+       /**
+        * @class mw.user
+        * @singleton
+        */
+       mw.user = {
+               /**
+                * @property {mw.Map}
+                */
+               options: new mw.Map(),
+               /**
+                * @property {mw.Map}
+                */
+               tokens: new mw.Map()
+       };
+
        // Alias $j to jQuery for backwards compatibility
        // @deprecated since 1.23 Use $ or jQuery instead
        mw.log.deprecate( window, '$j', $, 'Use $ or jQuery instead.' );