dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
9755d25
..
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.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' ),
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
@@
-121,14
+122,9
@@
return array(
/* jQuery */
'jquery' => 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' ),
),
'raw' => true,
'targets' => array( 'desktop', 'mobile' ),
),
@@
-1047,7
+1043,23
@@
return array(
'dependencies' => array(
'jquery.form',
'jquery.spinner',
'dependencies' => array(
'jquery.form',
'jquery.spinner',
+ 'mediawiki.api',
'mediawiki.action.history.diff',
'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(
),
),
'mediawiki.action.history' => array(