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 "[FileRepo] Fixed file move data-loss race condition."
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
34b9be6
..
3b26a00
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-525,32
+525,32
@@
return array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
'dependencies' => 'mediawiki.util',
),
'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
'dependencies' => 'mediawiki.util',
),
- 'mediawiki.api.category' => array(
+ 'mediawiki.api.category' => array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js',
'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js',
- 'dependencies' => array(
+ 'dependencies' => array(
'mediawiki.api',
'mediawiki.api',
- 'mediawiki.Title'
+ 'mediawiki.Title'
,
),
),
),
),
- 'mediawiki.api.edit' => array(
+ 'mediawiki.api.edit' => array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js',
'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js',
- 'dependencies' => array(
+ 'dependencies' => array(
'mediawiki.api',
'mediawiki.api',
- 'mediawiki.Title'
+ 'mediawiki.Title'
,
),
),
),
),
- 'mediawiki.api.parse' => array(
+ 'mediawiki.api.parse' => array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
'dependencies' => 'mediawiki.api',
),
'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
'dependencies' => 'mediawiki.api',
),
- 'mediawiki.api.titleblacklist' => array(
+ 'mediawiki.api.titleblacklist' => array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.titleblacklist.js',
'scripts' => 'resources/mediawiki.api/mediawiki.api.titleblacklist.js',
- 'dependencies' => array(
+ 'dependencies' => array(
'mediawiki.api',
'mediawiki.api',
- 'mediawiki.Title'
+ 'mediawiki.Title'
,
),
),
),
),
- 'mediawiki.api.watch' => array(
+ 'mediawiki.api.watch' => array(
'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js',
'dependencies' => array(
'mediawiki.api',
'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js',
'dependencies' => array(
'mediawiki.api',
@@
-573,13
+573,13
@@
return array(
'mediawiki.feedback' => array(
'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
'styles' => 'resources/mediawiki/mediawiki.feedback.css',
'mediawiki.feedback' => array(
'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
'styles' => 'resources/mediawiki/mediawiki.feedback.css',
- 'dependencies' => array(
- 'mediawiki.api.edit',
+ 'dependencies' => array(
+ 'mediawiki.api.edit',
'mediawiki.Title',
'mediawiki.jqueryMsg',
'jquery.ui.dialog',
),
'mediawiki.Title',
'mediawiki.jqueryMsg',
'jquery.ui.dialog',
),
- 'messages' => array(
+ 'messages' => array(
'feedback-bugornote',
'feedback-subject',
'feedback-message',
'feedback-bugornote',
'feedback-subject',
'feedback-message',
@@
-724,11
+724,19
@@
return array(
'uk' => 'resources/mediawiki.language/languages/uk.js',
'wa' => 'resources/mediawiki.language/languages/wa.js',
),
'uk' => 'resources/mediawiki.language/languages/uk.js',
'wa' => 'resources/mediawiki.language/languages/wa.js',
),
+ 'dependencies' => array( 'mediawiki.language.data' ),
+ ),
+
+ 'mediawiki.language.init' => array(
+ 'scripts' => 'resources/mediawiki.language/mediawiki.language.init.js',
),
'mediawiki.jqueryMsg' => array(
),
'mediawiki.jqueryMsg' => array(
- 'dependencies' => array( 'mediawiki.language', 'mediawiki.util' ),
- 'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js'
+ 'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js',
+ 'dependencies' => array(
+ 'mediawiki.util',
+ 'mediawiki.language',
+ ),
),
/* MediaWiki Libs */
),
/* MediaWiki Libs */