Merge "Make Preferences tests language-agnostic"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index ec02e5b..4f854fb 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -118,24 +118,6 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
 
-       /**
-        * Skins
-        * Be careful not to add 'scripts' to these modules,
-        * since they are loaded with OutputPage::addModuleStyles so that the skin styles
-        * apply without javascript.
-        * If a skin needs custom js in the interface, register a separate module
-        * and add it to the load queue with OutputPage::addModules.
-        *
-        * See Vector for an example.
-        */
-       'skins.monobook.styles' => array(
-               'styles' => array(
-                       'main.css' => array( 'media' => 'screen' ),
-               ),
-               'remoteSkinPath' => 'monobook',
-               'localBasePath' => $GLOBALS['wgStyleDirectory'] . '/monobook',
-       ),
-
        /* jQuery */
 
        'jquery' => array(
@@ -250,7 +232,11 @@ return array(
                'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
        ),
        'jquery.json' => array(
-               'scripts' => 'resources/lib/jquery/jquery.json.js',
+               // @deprecated since 1.24: Use the 'json' module and global JSON object instead.
+               'scripts' => array(
+                       'resources/lib/jquery/jquery.json.js',
+                       'resources/src/jquery.json-deprecate.js',
+               ),
                'targets' => array( 'mobile', 'desktop' ),
        ),
        'jquery.localize' => array(
@@ -294,7 +280,7 @@ return array(
        ),
        'jquery.jStorage' => array(
                'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
-               'dependencies' => 'jquery.json',
+               'dependencies' => 'json',
        ),
        'jquery.suggestions' => array(
                'scripts' => 'resources/src/jquery/jquery.suggestions.js',
@@ -694,14 +680,25 @@ return array(
                'group' => 'jquery.ui',
        ),
 
+       /* json2 */
+
+       'json' => array(
+               'scripts' => 'resources/lib/json2/json2.js',
+               'targets' => array( 'desktop', 'mobile' ),
+               'skipFunction' => 'resources/src/json-skip.js',
+       ),
+
        /* Moment.js */
 
        'moment' => array(
                'scripts' => 'resources/lib/moment/moment.js',
                'languageScripts' => array(
-                       'ar-ma' => 'resources/lib/moment/lang/ar-ma.js',
                        'ar' => 'resources/lib/moment/lang/ar.js',
+                       'ar-ma' => 'resources/lib/moment/lang/ar-ma.js',
+                       'ar-sa' => 'resources/lib/moment/lang/ar-sa.js',
+                       'az' => 'resources/lib/moment/lang/az.js',
                        'bg' => 'resources/lib/moment/lang/bg.js',
+                       'bn' => 'resources/lib/moment/lang/bn.js',
                        'br' => 'resources/lib/moment/lang/br.js',
                        'bs' => 'resources/lib/moment/lang/bs.js',
                        'ca' => 'resources/lib/moment/lang/ca.js',
@@ -710,6 +707,7 @@ return array(
                        'cy' => 'resources/lib/moment/lang/cy.js',
                        'da' => 'resources/lib/moment/lang/da.js',
                        'de' => 'resources/lib/moment/lang/de.js',
+                       'de-at' => 'resources/lib/moment/lang/de-at.js',
                        'el' => 'resources/lib/moment/lang/el.js',
                        'en-au' => 'resources/lib/moment/lang/en-au.js',
                        'en-ca' => 'resources/lib/moment/lang/en-ca.js',
@@ -753,15 +751,15 @@ return array(
                        'sk' => 'resources/lib/moment/lang/sk.js',
                        'sl' => 'resources/lib/moment/lang/sl.js',
                        'sq' => 'resources/lib/moment/lang/sq.js',
-                       'sr-el' => 'resources/lib/moment/lang/sr.js',
-                       'sr-ec' => 'resources/lib/moment/lang/sr-cyr.js',
+                       'sr' => 'resources/lib/moment/lang/sr.js',
+                       'sr-ec' => 'resources/lib/moment/lang/sr-cyrl.js',
                        'sv' => 'resources/lib/moment/lang/sv.js',
                        'ta' => 'resources/lib/moment/lang/ta.js',
                        'th' => 'resources/lib/moment/lang/th.js',
                        'tl-ph' => 'resources/lib/moment/lang/tl-ph.js',
                        'tr' => 'resources/lib/moment/lang/tr.js',
-                       'tzm-la' => 'resources/lib/moment/lang/tzm-la.js',
                        'tzm' => 'resources/lib/moment/lang/tzm.js',
+                       'tzm-latn' => 'resources/lib/moment/lang/tzm-latn.js',
                        'uk' => 'resources/lib/moment/lang/uk.js',
                        'uz' => 'resources/lib/moment/lang/uz.js',
                        'vi' => 'resources/lib/moment/lang/vi.js',
@@ -887,7 +885,7 @@ return array(
                'scripts' => 'resources/src/mediawiki/mediawiki.inspect.js',
                'dependencies' => array(
                        'jquery.byteLength',
-                       'jquery.json',
+                       'json',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1248,6 +1246,9 @@ return array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
                'dependencies' => 'jquery.byteLimit',
        ),
+       'mediawiki.special.pageLanguage' => array(
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
+       ),
        'mediawiki.special.pagesWithProp' => array(
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ),
@@ -1458,15 +1459,30 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
 
+       /* es5-shim */
+       'es5-shim' => array(
+               'scripts' => array(
+                       'resources/lib/es5-shim/es5-shim.js',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+               'skipFunction' => 'resources/src/es5-skip.js',
+       ),
+
        /* OOjs */
-       // WARNING: OOjs and OOjs-UI are NOT COMPATIBLE with older browsers and
-       // WILL BREAK if loaded in browsers that don't support ES5
        'oojs' => array(
                'scripts' => array(
                        'resources/lib/oojs/oojs.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
+               'dependencies' => array(
+                       'es5-shim',
+                       'json',
+               ),
        ),
+
+       /* OOjs UI */
+       // WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
+       // if loaded in browsers that don't support ES5
        'oojs-ui' => array(
                'scripts' => array(
                        'resources/lib/oojs-ui/oojs-ui.js',
@@ -1490,6 +1506,7 @@ return array(
                        'ooui-dialog-confirm-default-cancel'
                ),
                'dependencies' => array(
+                       'es5-shim',
                        'oojs',
                ),
                'targets' => array( 'desktop', 'mobile' ),