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 "Add window close warning to Special:Upload"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
8e907ee
..
c2c09df
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-93,6
+93,7
@@
return array(
),
),
'mediawiki.skinning.interface' => array(
),
),
'mediawiki.skinning.interface' => array(
+ 'class' => 'ResourceLoaderSkinModule',
// Used in the web installer. Test it after modifying this definition!
'styles' => array(
'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
// Used in the web installer. Test it after modifying this definition!
'styles' => array(
'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
@@
-200,6
+201,7
@@
return array(
'confirmable-confirm',
'confirmable-yes',
'confirmable-no',
'confirmable-confirm',
'confirmable-yes',
'confirmable-no',
+ 'word-separator',
),
'styles' => 'resources/src/jquery/jquery.confirmable.css',
'dependencies' => 'mediawiki.jqueryMsg',
),
'styles' => 'resources/src/jquery/jquery.confirmable.css',
'dependencies' => 'mediawiki.jqueryMsg',
@@
-818,6
+820,11
@@
return array(
'mediawiki.content.json' => array(
'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
),
'mediawiki.content.json' => array(
'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
),
+ 'mediawiki.confirmCloseWindow' => array(
+ 'scripts' => array(
+ 'resources/src/mediawiki/mediawiki.confirmCloseWindow.js',
+ ),
+ ),
'mediawiki.debug' => array(
'scripts' => array(
'resources/src/mediawiki/mediawiki.debug.js',
'mediawiki.debug' => array(
'scripts' => array(
'resources/src/mediawiki/mediawiki.debug.js',
@@
-1033,6
+1040,7
@@
return array(
'dependencies' => array(
'mediawiki.util',
'mediawiki.page.startup',
'dependencies' => array(
'mediawiki.util',
'mediawiki.page.startup',
+ 'user.options',
),
),
'mediawiki.action.view.metadata' => array(
),
),
'mediawiki.action.view.metadata' => array(
@@
-1063,11
+1071,6
@@
return array(
),
'position' => 'top',
),
),
'position' => 'top',
),
- // Deployment hack for compatibility with cached HTML, remove before 1.24 release
- 'mediawiki.action.view.redirectToFragment' => array(
- 'dependencies' => 'mediawiki.action.view.redirect',
- 'position' => 'top',
- ),
'mediawiki.action.view.redirectPage' => array(
'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css',
'position' => 'top',
'mediawiki.action.view.redirectPage' => array(
'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css',
'position' => 'top',
@@
-1079,7
+1082,8
@@
return array(
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
'dependencies' => array(
'jquery.textSelection',
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
'dependencies' => array(
'jquery.textSelection',
- 'mediawiki.jqueryMsg'
+ 'mediawiki.jqueryMsg',
+ 'mediawiki.confirmCloseWindow',
),
'messages' => array(
'editwarning-warning',
),
'messages' => array(
'editwarning-warning',
@@
-1175,11
+1179,11
@@
return array(
'mediawiki.page.ready' => array(
'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
'dependencies' => array(
'mediawiki.page.ready' => array(
'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
'dependencies' => array(
+ 'jquery.accessKeyLabel',
'jquery.checkboxShiftClick',
'jquery.makeCollapsible',
'jquery.placeholder',
'jquery.mw-jump',
'jquery.checkboxShiftClick',
'jquery.makeCollapsible',
'jquery.placeholder',
'jquery.mw-jump',
- 'mediawiki.util',
),
'targets' => array( 'desktop', 'mobile' ),
),
),
'targets' => array( 'desktop', 'mobile' ),
),
@@
-1296,6
+1300,8
@@
return array(
'position' => 'top',
'messages' => array(
'prefs-tabs-navigation-hint',
'position' => 'top',
'messages' => array(
'prefs-tabs-navigation-hint',
+ 'prefswarning-warning',
+ 'saveprefs',
),
'dependencies' => array(
'mediawiki.language',
),
'dependencies' => array(
'mediawiki.language',
@@
-1334,6
+1340,7
@@
return array(
'mediawiki.libs.jpegmeta',
'mediawiki.Title',
'mediawiki.util',
'mediawiki.libs.jpegmeta',
'mediawiki.Title',
'mediawiki.util',
+ 'mediawiki.confirmCloseWindow',
),
),
'mediawiki.special.userlogin.common.styles' => array(
),
),
'mediawiki.special.userlogin.common.styles' => array(
@@
-1510,6
+1517,13
@@
return array(
'position' => 'top',
'targets' => array( 'desktop', 'mobile' ),
),
'position' => 'top',
'targets' => array( 'desktop', 'mobile' ),
),
+ 'mediawiki.ui.icon' => array(
+ 'styles' => array(
+ 'resources/src/mediawiki.ui/components/icons.less',
+ ),
+ 'position' => 'top',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
/* es5-shim */
'es5-shim' => array(
/* es5-shim */
'es5-shim' => array(