X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=ccb842ded622c34a1083334eb1b913aff4d32b6c;hb=96dd55fde17f13f61060c5786ef4076742af9272;hp=72cc2ef647b57f2c436a9aaa1e4592844dcf7792;hpb=3a6c9d36c9ebf7dea98ebc3f17a44569f2f220de;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 72cc2ef647..ccb842ded6 100644
--- 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' ),
 	),
@@ -762,6 +758,7 @@ return array(
 			'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
 			'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
 		),
+		'targets' => array( 'desktop', 'mobile' ),
 	),
 
 	/* MediaWiki */
@@ -1014,6 +1011,7 @@ return array(
 		'class' => 'ResourceLoaderEditToolbarModule',
 		'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
 		'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
+		'position' => 'top',
 	),
 
 	/* MediaWiki Action */
@@ -1023,7 +1021,6 @@ return array(
 		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
 		'dependencies' => array(
 			'mediawiki.action.edit.styles',
-			'mediawiki.toolbar',
 			'jquery.textSelection',
 			'jquery.byteLimit',
 		),
@@ -1047,7 +1044,16 @@ 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(
@@ -1622,12 +1628,12 @@ return array(
 			'resources/lib/oojs-ui/oojs-ui.js',
 		),
 		'skinScripts' => array(
-			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
-			'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
 		),
-		'skinStyles' => array(
-			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
-			'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
+		'dependencies' => array(
+			'es5-shim',
+			'oojs',
+			'oojs-ui.styles',
 		),
 		'messages' => array(
 			'ooui-dialog-message-accept',
@@ -1643,9 +1649,13 @@ return array(
 			'ooui-toolgroup-collapse',
 			'ooui-toolgroup-expand',
 		),
-		'dependencies' => array(
-			'es5-shim',
-			'oojs',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+
+	'oojs-ui.styles' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),