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 "SpecialMovepage: Convert form to use OOUI controls"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
be06225
..
07142a5
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-847,6
+847,12
@@
return array(
'resources/src/mediawiki/mediawiki.template.mustache.js',
),
'targets' => array( 'desktop', 'mobile' ),
'resources/src/mediawiki/mediawiki.template.mustache.js',
),
'targets' => array( 'desktop', 'mobile' ),
+ 'dependencies' => 'mediawiki.template',
+ ),
+ 'mediawiki.template.regexp' => array(
+ 'scripts' => 'resources/src/mediawiki/mediawiki.template.regexp.js',
+ 'targets' => array( 'desktop', 'mobile' ),
+ 'dependencies' => 'mediawiki.template',
),
'mediawiki.apipretty' => array(
'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
),
'mediawiki.apipretty' => array(
'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
@@
-1024,6
+1030,10
@@
return array(
'colon-separator',
),
),
'colon-separator',
),
),
+ 'mediawiki.htmlform.styles' => array(
+ 'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
+ 'position' => 'top',
+ ),
'mediawiki.htmlform.ooui.styles' => array(
'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
'position' => 'top',
'mediawiki.htmlform.ooui.styles' => array(
'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
'position' => 'top',
@@
-1170,6
+1180,10
@@
return array(
),
'mediawiki.Uri' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
),
'mediawiki.Uri' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
+ 'templates' => array(
+ 'strict.regexp' => 'resources/src/mediawiki/mediawiki.Uri.strict.regexp',
+ 'loose.regexp' => 'resources/src/mediawiki/mediawiki.Uri.loose.regexp',
+ ),
'dependencies' => 'mediawiki.util',
'targets' => array( 'desktop', 'mobile' ),
),
'dependencies' => 'mediawiki.util',
'targets' => array( 'desktop', 'mobile' ),
),
@@
-1353,6
+1367,13
@@
return array(
'prefs-editing'
),
),
'prefs-editing'
),
),
+ 'mediawiki.action.view.filepage' => array(
+ 'styles' => array(
+ 'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
+ 'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
+ ),
+ 'position' => 'top',
+ ),
/* MediaWiki Language */
/* MediaWiki Language */
@@
-1581,7
+1602,14
@@
return array(
),
'mediawiki.special.movePage' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
),
'mediawiki.special.movePage' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
- 'dependencies' => 'jquery.byteLimit',
+ 'dependencies' => array(
+ 'jquery.byteLimit',
+ 'mediawiki.widgets',
+ ),
+ ),
+ 'mediawiki.special.movePage.styles' => array(
+ 'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css',
+ 'position' => 'top',
),
'mediawiki.special.pageLanguage' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
),
'mediawiki.special.pageLanguage' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
@@
-1669,15
+1697,6
@@
return array(
'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
),
),
'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
),
),
- 'mediawiki.special.userlogin.common.js' => array(
- 'scripts' => array(
- 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.js',
- ),
- 'messages' => array(
- 'createacct-captcha',
- 'createacct-imgcaptcha-ph',
- ),
- ),
'mediawiki.special.userlogin.signup.js' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
'messages' => array(
'mediawiki.special.userlogin.signup.js' => array(
'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
'messages' => array(
@@
-1742,9
+1761,10
@@
return array(
'styles' => array(
// @todo: Remove mediawiki.page.gallery when cache has cleared
'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
'styles' => array(
// @todo: Remove mediawiki.page.gallery when cache has cleared
'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
+ // @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared
+ 'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
),
'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
),
- 'group' => 'print',
),
'mediawiki.legacy.protect' => array(
'scripts' => 'resources/src/mediawiki.legacy/protect.js',
),
'mediawiki.legacy.protect' => array(
'scripts' => 'resources/src/mediawiki.legacy/protect.js',
@@
-1757,6
+1777,9
@@
return array(
'styles' => array(
// @todo: Remove when mediawiki.page.gallery in cached html.
'resources/src/mediawiki.page/mediawiki.page.gallery.css',
'styles' => array(
// @todo: Remove when mediawiki.page.gallery in cached html.
'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+ // @todo: Remove mediawiki.action.view.filepage.css
+ // and mediawiki.legacy/images/checker.png when cache has cleared
+ 'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
),
),
'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
),
),
@@
-1859,8
+1882,10
@@
return array(
'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
+ 'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
+ 'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
),
'skinStyles' => array(
'default' => array(
),
'skinStyles' => array(
'default' => array(
@@
-1899,6
+1924,7
@@
return array(
'skinStyles' => array(
'default' => array(
'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css',
'skinStyles' => array(
'default' => array(
'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css',
+ 'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css',
),
),
'position' => 'top',
),
),
'position' => 'top',