Merge "Align mediawiki.ui vars with CSS color guidelines"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index c66dcb2..ad2f12c 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1261,6 +1261,7 @@ return array(
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.jqueryMsg',
                        'moment',
+                       'mediawiki.libs.jpegmeta',
                ),
                'messages' => array(
                        'foreign-structured-upload-form-label-own-work',
@@ -1478,6 +1479,7 @@ return array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.redirect.js',
                'dependencies' => 'jquery.client',
                'position' => 'top',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.action.view.redirectPage' => array(
                'position' => 'top',
@@ -1632,7 +1634,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.page.patrol.ajax' => array(
-               'scripts' => 'resources/src/mediawiki/page/patrol.js',
+               'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js',
                'dependencies' => array(
                        'mediawiki.page.startup',
                        'mediawiki.api',
@@ -1866,16 +1868,6 @@ return array(
        'mediawiki.special.watchlist' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
        ),
-       'mediawiki.special.javaScriptTest' => array(
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js',
-               'messages' => array_merge( Skin::getSkinNameMessages(), array(
-                       'colon-separator',
-                       'javascripttest-pagetext-skins',
-               ) ),
-               'dependencies' => 'mediawiki.Uri',
-               'position' => 'top',
-               'targets' => array( 'desktop', 'mobile' ),
-       ),
        'mediawiki.special.version' => array(
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
        ),