Merge "Register a shutdown function to log fatal errors"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index c39ba3b..1049a6a 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -44,6 +44,7 @@ return array(
        'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
 
        // Populate mediawiki.user placeholders with information about the current user
+       'user.defaults' => array( 'class' => 'ResourceLoaderUserDefaultsModule' ),
        'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
        'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
 
@@ -121,14 +122,9 @@ return array(
        /* jQuery */
 
        'jquery' => array(
-               'scripts' => ( $GLOBALS['wgIncludejQueryMigrate'] ?
-                       array(
-                               'resources/lib/jquery/jquery.js',
-                               'resources/lib/jquery/jquery.migrate.js'
-                       ) :
-                       array(
-                               'resources/lib/jquery/jquery.js'
-                       ) ),
+               'scripts' => array(
+                       'resources/lib/jquery/jquery.js',
+               ),
                'raw' => true,
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -778,6 +774,7 @@ return array(
                'dependencies' => array(
                        'mediawiki.hlist',
                ),
+               'position' => 'top',
        ),
        'mediawiki.template' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
@@ -786,6 +783,7 @@ return array(
        'mediawiki.apipretty' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
                'targets' => array( 'desktop', 'mobile' ),
+               'position' => 'top',
        ),
        'mediawiki.api' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js',
@@ -949,6 +947,7 @@ return array(
                        'jquery.client',
                        'jquery.placeholder',
                        'jquery.suggestions',
+                       'jquery.getAttrs',
                        'mediawiki.api',
                ),
        ),
@@ -1044,7 +1043,23 @@ return array(
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
+                       'mediawiki.api',
                        'mediawiki.action.history.diff',
+                       'mediawiki.util',
+                       'mediawiki.jqueryMsg',
+               ),
+               'messages' => array(
+                       'otherlanguages',
+                       'tooltip-p-lang',
+                       'summary-preview',
+                       'parentheses',
+               ),
+       ),
+       'mediawiki.action.edit.stash' => array(
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
+               'dependencies' => array(
+                       'jquery.getAttrs',
+                       'mediawiki.api',
                ),
        ),
        'mediawiki.action.history' => array(
@@ -1524,6 +1539,15 @@ return array(
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.ui.radio' => array(
+               'skinStyles' => array(
+                       'default' => array(
+                               'resources/src/mediawiki.ui/components/radio.less',
+                       ),
+               ),
+               'position' => 'top',
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
        // Lightweight module for anchor styles
        'mediawiki.ui.anchor' => array(
                'skinStyles' => array(