Merge "Added RedisBagOStuff FIXME comments"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index b32dd33..5f51702 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -209,7 +209,6 @@ return array(
                'styles' => 'resources/src/jquery/jquery.confirmable.css',
                'dependencies' => 'mediawiki.jqueryMsg',
        ),
-       // Use mediawiki.cookie in new code, rather than jquery.cookie.
        'jquery.cookie' => array(
                'scripts' => 'resources/lib/jquery/jquery.cookie.js',
                'targets' => array( 'desktop', 'mobile' ),
@@ -773,6 +772,7 @@ return array(
        /* MediaWiki */
 
        'mediawiki' => array(
+               'class' => 'ResourceLoaderRawFileModule',
                // Keep maintenance/jsduck/eg-iframe.html in sync
                'scripts' => array(
                        'resources/src/mediawiki/mediawiki.js',
@@ -780,7 +780,6 @@ return array(
                        'resources/src/mediawiki/mediawiki.startUp.js',
                ),
                'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
-               'raw' => true,
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.apihelp' => array(
@@ -981,10 +980,13 @@ return array(
        ),
        'mediawiki.notification' => array(
                'styles' => array(
-                       'resources/src/mediawiki/mediawiki.notification.css',
+                       'resources/src/mediawiki/mediawiki.notification.common.css',
                        'resources/src/mediawiki/mediawiki.notification.hideForPrint.css'
                                => array( 'media' => 'print' ),
                ),
+               'skinStyles' => array(
+                       'default' => 'resources/src/mediawiki/mediawiki.notification.css',
+               ),
                'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
                'dependencies' => 'mediawiki.page.startup',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1027,7 +1029,7 @@ return array(
        ),
        'mediawiki.toc' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
-               'dependencies' => 'jquery.cookie',
+               'dependencies' => 'mediawiki.cookie',
                'messages' => array( 'showtoc', 'hidetoc' ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1039,7 +1041,7 @@ return array(
        'mediawiki.user' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.user.js',
                'dependencies' => array(
-                       'jquery.cookie',
+                       'mediawiki.cookie',
                        'mediawiki.api',
                        'user.options',
                        'user.tokens',
@@ -1762,7 +1764,6 @@ return array(
 
        'oojs-ui.styles.icons' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1770,19 +1771,16 @@ return array(
        ),
        'oojs-ui.styles.indicators' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'indicators.json',
        ),
        'oojs-ui.styles.textures' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'textures.json',
        ),
        'oojs-ui.styles.icons-alerts' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-alerts.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1790,7 +1788,6 @@ return array(
        ),
        'oojs-ui.styles.icons-content' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-content.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1798,7 +1795,6 @@ return array(
        ),
        'oojs-ui.styles.icons-editing-advanced' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-editing-advanced.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1806,7 +1802,6 @@ return array(
        ),
        'oojs-ui.styles.icons-editing-core' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-editing-core.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1814,7 +1809,6 @@ return array(
        ),
        'oojs-ui.styles.icons-editing-list' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-editing-list.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1822,7 +1816,6 @@ return array(
        ),
        'oojs-ui.styles.icons-editing-styling' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-editing-styling.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1830,7 +1823,6 @@ return array(
        ),
        'oojs-ui.styles.icons-interactions' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-interactions.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1838,7 +1830,6 @@ return array(
        ),
        'oojs-ui.styles.icons-layout' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-layout.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1846,7 +1837,6 @@ return array(
        ),
        'oojs-ui.styles.icons-location' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-location.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1854,7 +1844,6 @@ return array(
        ),
        'oojs-ui.styles.icons-media' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-media.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1862,7 +1851,6 @@ return array(
        ),
        'oojs-ui.styles.icons-moderation' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-moderation.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1870,7 +1858,6 @@ return array(
        ),
        'oojs-ui.styles.icons-movement' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-movement.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1878,7 +1865,6 @@ return array(
        ),
        'oojs-ui.styles.icons-user' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-user.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',
@@ -1886,7 +1872,6 @@ return array(
        ),
        'oojs-ui.styles.icons-wikimedia' => array(
                'class' => 'ResourceLoaderImageModule',
-               'position' => 'top',
                'localBasePath' => "$IP/resources/lib/oojs-ui/themes/mediawiki",
                'data' => 'icons-wikimedia.json',
                'selectorWithoutVariant' => '.oo-ui-icon-{name}, .mw-ui-icon-{name}:after, .mw-ui-icon-{name}:before',