X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=085462cbd3ee953c5aadc50837c9a3588bd9bcec;hb=b1896720e1e8fb5af631d7cd20e8f68a9f753d53;hp=0093ab1b9b88946b81751f5dd4f5df9bdfa52ad0;hpb=3d2009277fcd139025f5994a9f01d545659efdc6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 0093ab1b9b..085462cbd3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -3,65 +3,143 @@
 return array(
 
 	/* Special resources who have their own classes */
-	
-	'site' => new ResourceLoaderSiteModule,
-	'startup' => new ResourceLoaderStartUpModule,
-	'user' => new ResourceLoaderUserModule,
-	'user.options' => new ResourceLoaderUserOptionsModule,
-	
+
+	'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
+	'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
+	'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+	'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+	'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
+
 	/* Skins */
-	
-	'vector' => new ResourceLoaderFileModule(
-		array( 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) ) )
+
+	'skins.vector' => array(
+		'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.monobook' => array(
+		'styles' => array(
+			'monobook/main.css' => array( 'media' => 'screen' ),
+		),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.simple' => array(
+		'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.chick' => array(
+		'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.modern' => array(
+		'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
+				   'modern/print.css' => array( 'media' => 'print' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 	),
-	
+	'skins.cologneblue' => array(
+		'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.nostalgia' => array(
+		'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'skins.standard' => array(
+		'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+
 	/* jQuery */
-	
-	'jquery' => new ResourceLoaderFileModule( array( 'scripts' => 'resources/jquery/jquery.js' ) ),
-	
+
+	'jquery' => array(
+		'scripts' => 'resources/jquery/jquery.js',
+		'debugRaw' => false
+	),
+
 	/* jQuery Plugins */
-	
-	'jquery.async' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.async.js' )
+
+	'jquery.async' => array(
+		'scripts' => 'resources/jquery/jquery.async.js',
 	),
-	'jquery.autoEllipsis' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.autoEllipsis.js' )
+	'jquery.autoEllipsis' => array(
+		'scripts' => 'resources/jquery/jquery.autoEllipsis.js',
+		'dependencies' => 'jquery.highlightText',
 	),
-	'jquery.client' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.client.js' )
+	'jquery.checkboxShiftClick' => array(
+		'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js',
 	),
-	'jquery.color' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.color.js' )
+	'jquery.client' => array(
+		'scripts' => 'resources/jquery/jquery.client.js',
 	),
-	'jquery.cookie' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.cookie.js' )
+	'jquery.collapsibleTabs' => array(
+		'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
 	),
-	'jquery.delayedBind' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.delayedBind.js' )
+	'jquery.colorUtil' => array(
+		'scripts' => 'resources/jquery/jquery.colorUtil.js',
 	),
-	'jquery.expandableField' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.expandableField.js' )
+	'jquery.color' => array(
+		'scripts' => 'resources/jquery/jquery.color.js',
+		'dependencies' => 'jquery.colorUtil',
 	),
-	'jquery.highlightText' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.highlightText.js' )
+	'jquery.cookie' => array(
+		'scripts' => 'resources/jquery/jquery.cookie.js',
 	),
-	'jquery.suggestions' => new ResourceLoaderFileModule(
-		array(
-			'scripts' => 'resources/jquery/jquery.suggestions.js',
-			'styles' => 'resources/jquery/jquery.suggestions.css',
-		)
+	'jquery.delayedBind' => array(
+		'scripts' => 'resources/jquery/jquery.delayedBind.js',
 	),
-	'jquery.tabIndex' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.tabIndex.js' )
+	'jquery.expandableField' => array(
+		'scripts' => 'resources/jquery/jquery.expandableField.js',
 	),
-	'jquery.textSelection' => new ResourceLoaderFileModule(
-		array( 'scripts' => 'resources/jquery/jquery.textSelection.js' )
+	'jquery.form' => array(
+		'scripts' => 'resources/jquery/jquery.form.js',
 	),
-	
+	'jquery.highlightText' => array(
+		'scripts' => 'resources/jquery/jquery.highlightText.js',
+	),
+	'jquery.hoverIntent' => array(
+		'scripts' => 'resources/jquery/jquery.hoverIntent.js',
+	),
+	'jquery.messageBox' => array(
+		'scripts' => 'resources/jquery/jquery.messageBox.js',
+		'styles' => 'resources/jquery/jquery.messageBox.css',
+	),
+	'jquery.placeholder' => array(
+		'scripts' => 'resources/jquery/jquery.placeholder.js',
+	),
+	'jquery.localize' => array(
+		'scripts' => 'resources/jquery/jquery.localize.js',
+	),
+	'jquery.makeCollapsible' => array(
+		'scripts' => 'resources/jquery/jquery.makeCollapsible.js',
+		'styles' => 'resources/jquery/jquery.makeCollapsible.css',
+		'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
+	),
+	'jquery.suggestions' => array(
+		'scripts' => 'resources/jquery/jquery.suggestions.js',
+		'styles' => 'resources/jquery/jquery.suggestions.css',
+	),
+	'jquery.tabIndex' => array(
+		'scripts' => 'resources/jquery/jquery.tabIndex.js',
+	),
+	'jquery.textSelection' => array(
+		'scripts' => 'resources/jquery/jquery.textSelection.js',
+	),
+	'jquery.tipsy' => array(
+		'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
+		'styles' => 'resources/jquery.tipsy/jquery.tipsy.css',
+	),
+
 	/* jQuery UI */
-	
+
 	// Core
-	'jquery.ui.core' => new ResourceLoaderFileModule( array(
+	'jquery.ui.core' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.core.js',
 		'skinStyles' => array(
 			'default' => array(
@@ -74,74 +152,74 @@ return array(
 			),
 		),
 		'dependencies' => 'jquery',
-	) ),
-	'jquery.ui.widget' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.widget' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.widget.js',
-		'dependencies' => 'jquery.ui.core',
-	) ),
-	'jquery.ui.mouse' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.mouse' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.mouse.js',
-		'dependencies' => 'jquery',
-	) ),
-	'jquery.ui.position' => new ResourceLoaderFileModule( array(
+		'dependencies' => 'jquery.ui.widget',
+	),
+	'jquery.ui.position' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.position.js',
-		'dependencies' => 'jquery',
-	) ),
+	),
 	// Interactions
-	'jquery.ui.draggable' => new ResourceLoaderFileModule( array(
+	'jquery.ui.draggable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.draggable.js',
-		'dependencies' => 'jquery.ui.core',
-	) ),
-	'jquery.ui.droppable' => new ResourceLoaderFileModule( array(
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget' ),
+	),
+	'jquery.ui.droppable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
-		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.draggable' ),
-	) ),
-	'jquery.ui.resizable' => new ResourceLoaderFileModule( array(
+		'dependencies' => array(
+			'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable',
+		),
+	),
+	'jquery.ui.resizable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.resizable.js',
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.resizable.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.resizable.css',
 		),
-		'dependencies' => 'jquery.ui.core',
-	) ),
-	'jquery.ui.selectable' => new ResourceLoaderFileModule( array(
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+	),
+	'jquery.ui.selectable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.selectable.js',
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.selectable.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.selectable.css',
 		),
-		'dependencies' => 'jquery.ui.core',
-	) ),
-	'jquery.ui.sortable' => new ResourceLoaderFileModule( array(
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+	),
+	'jquery.ui.sortable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.sortable.js',
-		'dependencies' => 'jquery.ui.core',
-	) ),
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+	),
 	// Widgets
-	'jquery.ui.accordion' => new ResourceLoaderFileModule( array(
+	'jquery.ui.accordion' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.accordion.js',
-		'dependencies' => 'jquery.ui.core',
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.accordion.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.accordion.css',
 		),
-	) ),
-	'jquery.ui.autocomplete' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.autocomplete' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.autocomplete.js',
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.position' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.autocomplete.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css',
 		),
-	) ),
-	'jquery.ui.button' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.button' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.button.js',
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.button.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.button.css',
 		),
-	) ),
-	'jquery.ui.datepicker' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.datepicker' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.datepicker.js',
 		'dependencies' => 'jquery.ui.core',
 		'skinStyles' => array(
@@ -200,209 +278,354 @@ return array(
 			'vi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-vi.js',
 			'zh-cn' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-CN.js',
 			'zh-hk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
-			'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js'
+			'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
 		),
-	) ),
-	'jquery.ui.dialog' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.dialog' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.dialog.js',
-		'dependencies' => 'jquery.ui.core',
+		'dependencies' => array(
+			'jquery.ui.core',
+			'jquery.ui.widget',
+			'jquery.ui.button',
+			'jquery.ui.draggable',
+			'jquery.ui.mouse',
+			'jquery.ui.position',
+			'jquery.ui.resizable',
+		),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.dialog.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
 		),
-	) ),
-	'jquery.ui.progressbar' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.progressbar' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.progressbar.js',
-		'dependencies' => 'jquery.ui.core',
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.progressbar.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
 		),
-	) ),
-	'jquery.ui.slider' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.slider' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.slider.js',
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.slider.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.slider.css',
 		),
-	) ),
-	'jquery.ui.tabs' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.ui.tabs' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.tabs.js',
-		'dependencies' => 'jquery.ui.core',
+		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
 		'skinStyles' => array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.tabs.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.tabs.css',
 		),
-	) ),
+	),
 	// Effects
-	'jquery.effects.core' => new ResourceLoaderFileModule( array(
+	'jquery.effects.core' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.core.js',
 		'dependencies' => 'jquery',
-	) ),
-	'jquery.effects.blind' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.blind' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.blind.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.bounce' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.bounce' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.bounce.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.clip' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.clip' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.clip.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.drop' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.drop' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.drop.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.explode' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.explode' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.explode.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.fold' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.fold' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.fold.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.highlight' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.highlight' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.highlight.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.pulsate' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.pulsate' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.pulsate.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.scale' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.scale' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.scale.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.shake' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.shake' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.shake.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.slide' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.slide' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.slide.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	'jquery.effects.transfer' => new ResourceLoaderFileModule( array(
+	),
+	'jquery.effects.transfer' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js',
 		'dependencies' => 'jquery.effects.core',
-	) ),
-	
+	),
+
 	/* MediaWiki */
-	
-	'mediawiki' => new ResourceLoaderFileModule( array(
+
+	'mediawiki' => array(
 		'scripts' => 'resources/mediawiki/mediawiki.js',
 		'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
-	) ),
-	
-	/* MediaWiki Utilities */
-	
-	'mediawiki.util.client' => new ResourceLoaderFileModule( array(
-		'scripts' => 'resources/mediawiki.util/mediawiki.util.client.js',
-	) ),
-	
-	/* MediaWiki Legacy */
-	
-	'mediawiki.legacy.ajax' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/ajax.js',
-		'messages' => array( 'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', 'tooltip-ca-unwatch' ),
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.ajaxwatch' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/ajaxwatch.js',
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.block' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/block.js',
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.changepassword' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/changepassword.js',
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.commonPrint' => new ResourceLoaderFileModule( array(
-		'styles' => array( 'skins/common/commonPrint.css' => array( 'media' => 'print' ) ),
-	) ),
-	'mediawiki.legacy.config' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/config.js',
-		'styles' => array( 'skins/common/config.css', 'skins/common/config-cc.css' ),
+		'debugRaw' => false,
+	),
+	'mediawiki.util' => array(
+		'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
+		'dependencies' => array(
+			'jquery.checkboxShiftClick',
+			'jquery.client',
+			'jquery.cookie',
+			'jquery.messageBox',
+			'jquery.makeCollapsible',
+			'jquery.placeholder',
+		),
+		'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
+	),
+	'mediawiki.util.jpegmeta' => array(
+		'scripts' => 'resources/mediawiki.util/mediawiki.util.jpegmeta.js',
+	),
+	'mediawiki.action.history' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
+		'dependencies' => 'mediawiki.legacy.history',
+		'group' => 'mediawiki.action.history',
+	),
+	'mediawiki.action.edit' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
+	),
+	'mediawiki.action.view.rightClickEdit' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
+	),
+	'mediawiki.action.watch.ajax' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
+		'dependencies' => 'mediawiki.util',
+	),
+	'mediawiki.special.preferences' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
+		'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
+		'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),
+	),
+	'mediawiki.special.changeslist' => array(
+		'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
+		'dependencies' => array( 'jquery.makeCollapsible' ),
+	),
+	'mediawiki.special.search' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
+	),
+	'mediawiki.special.upload' => array(
+		// @TODO: merge in remainder of mediawiki.legacy.upload
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
+		'messages' => array(
+			'widthheight',
+			'size-bytes',
+			'size-kilobytes',
+			'size-megabytes',
+			'size-gigabytes',
+		),
+		'dependencies' => array( 'mediawiki.util.jpegmeta' ),
+	),
+	'mediawiki.language' => array(
+		'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
+		'languageScripts' => array(
+			'am' => 'resources/mediawiki.language/languages/am.js',
+			'ar' => 'resources/mediawiki.language/languages/ar.js',
+			'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js',
+			'be' => 'resources/mediawiki.language/languages/be.js',
+			'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js',
+			'bh' => 'resources/mediawiki.language/languages/bh.js',
+			'bs' => 'resources/mediawiki.language/languages/bs.js',
+			'cs' => 'resources/mediawiki.language/languages/cs.js',
+			'cu' => 'resources/mediawiki.language/languages/cu.js',
+			'cy' => 'resources/mediawiki.language/languages/cy.js',
+			'dsb' => 'resources/mediawiki.language/languages/dsb.js',
+			'fr' => 'resources/mediawiki.language/languages/fr.js',
+			'ga' => 'resources/mediawiki.language/languages/ga.js',
+			'gd' => 'resources/mediawiki.language/languages/gd.js',
+			'gv' => 'resources/mediawiki.language/languages/gv.js',
+			'he' => 'resources/mediawiki.language/languages/he.js',
+			'hi' => 'resources/mediawiki.language/languages/hi.js',
+			'hr' => 'resources/mediawiki.language/languages/hr.js',
+			'hsb' => 'resources/mediawiki.language/languages/hsb.js',
+			'hy' => 'resources/mediawiki.language/languages/hy.js',
+			'ksh' => 'resources/mediawiki.language/languages/ksh.js',
+			'ln' => 'resources/mediawiki.language/languages/ln.js',
+			'lt' => 'resources/mediawiki.language/languages/lt.js',
+			'lv' => 'resources/mediawiki.language/languages/lv.js',
+			'mg' => 'resources/mediawiki.language/languages/mg.js',
+			'mk' => 'resources/mediawiki.language/languages/mk.js',
+			'mo' => 'resources/mediawiki.language/languages/mo.js',
+			'mt' => 'resources/mediawiki.language/languages/mt.js',
+			'nso' => 'resources/mediawiki.language/languages/nso.js',
+			'pl' => 'resources/mediawiki.language/languages/pl.js',
+			'pt-br' => 'resources/mediawiki.language/languages/pt-br.js',
+			'ro' => 'resources/mediawiki.language/languages/ro.js',
+			'ru' => 'resources/mediawiki.language/languages/ru.js',
+			'se' => 'resources/mediawiki.language/languages/se.js',
+			'sh' => 'resources/mediawiki.language/languages/sh.js',
+			'sk' => 'resources/mediawiki.language/languages/sk.js',
+			'sl' => 'resources/mediawiki.language/languages/sl.js',
+			'sma' => 'resources/mediawiki.language/languages/sma.js',
+			'sr-ec' => 'resources/mediawiki.language/languages/sr-ec.js',
+			'sr-el' => 'resources/mediawiki.language/languages/sr-el.js',
+			'sr' => 'resources/mediawiki.language/languages/sr.js',
+			'ti' => 'resources/mediawiki.language/languages/ti.js',
+			'tl' => 'resources/mediawiki.language/languages/tl.js',
+			'uk' => 'resources/mediawiki.language/languages/uk.js',
+			'wa' => 'resources/mediawiki.language/languages/wa.js',
+		),
+	),
+
+	/* mediawiki Legacy */
+
+	'mediawiki.legacy.ajax' => array(
+		'scripts' => 'common/ajax.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+		'messages' => array(
+			'watch',
+			'unwatch',
+			'watching',
+			'unwatching',
+			'tooltip-ca-watch',
+			'tooltip-ca-unwatch',
+		),
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.diff' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/diff.js',
-		'styles' => 'skins/common/diff.css',
+	),
+	'mediawiki.legacy.block' => array(
+		'scripts' => 'common/block.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.edit' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/edit.js',
+	),
+	'mediawiki.legacy.commonPrint' => array(
+		'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'mediawiki.legacy.config' => array(
+		'scripts' => 'common/config.js',
+		'styles' => array( 'common/config.css', 'common/config-cc.css' ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.enhancedchanges' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/enhancedchanges.js',
+	),
+	'mediawiki.legacy.diff' => array(
+		'scripts' => 'common/diff.js',
+		'styles' => 'common/diff.css',
+		'group' => 'mediawiki.action.history',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.history' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/history.js',
+	),
+	'mediawiki.legacy.edit' => array(
+		'scripts' => 'common/edit.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.htmlform' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/htmlform.js',
+	),
+	'mediawiki.legacy.history' => array(
+		'scripts' => 'common/history.js',
+		'group' => 'mediawiki.action.history',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.IEFixes' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/IEFixes.js',
+	),
+	'mediawiki.legacy.htmlform' => array(
+		'scripts' => 'common/htmlform.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.metadata' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/metadata.js',
+	),
+	'mediawiki.legacy.IEFixes' => array(
+		'scripts' => 'common/IEFixes.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.mwsuggest' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/mwsuggest.js',
+	),
+	'mediawiki.legacy.metadata' => array(
+		'scripts' => 'common/metadata.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
+		'messages' => array( 'metadata-expand', 'metadata-collapse' ),
+	),
+	'mediawiki.legacy.mwsuggest' => array(
+		'scripts' => 'common/mwsuggest.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+		'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
 		'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
-	) ),
-	'mediawiki.legacy.password' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/password.js',
-		'styles' => 'skins/common/password.css',
+	),
+	'mediawiki.legacy.password' => array(
+		'scripts' => 'common/password.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+		'styles' => 'common/password.css',
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.prefs' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/prefs.js',
+	),
+	'mediawiki.legacy.prefs' => array(
+		'scripts' => 'common/prefs.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => array( 'mediawiki.legacy.wikibits', 'mediawiki.legacy.htmlform' ),
-	) ),
-	'mediawiki.legacy.preview' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/preview.js',
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.protect' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/protect.js',
+	),
+	'mediawiki.legacy.preview' => array(
+		'scripts' => 'common/preview.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.rightclickedit' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/rightclickedit.js',
+	),
+	'mediawiki.legacy.protect' => array(
+		'scripts' => 'common/protect.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.search' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/search.js',
+	),
+	'mediawiki.legacy.search' => array(
+		'scripts' => 'common/search.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+		'styles' => 'common/search.css',
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array(
-		'styles' => array( 'skins/common/shared.css' => array( 'media' => 'screen' ) ),
-	) ),
-	'mediawiki.legacy.oldshared' => new ResourceLoaderFileModule( array(
-		'styles' => array( 'skins/common/oldshared.css' => array( 'media' => 'screen' ) ),
-	) ),
-	'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/upload.js',
+	),
+	'mediawiki.legacy.shared' => array(
+		'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'mediawiki.legacy.oldshared' => array(
+		'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+	'mediawiki.legacy.upload' => array(
+		'scripts' => 'common/upload.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
 		'dependencies' => 'mediawiki.legacy.wikibits',
-	) ),
-	'mediawiki.legacy.wikibits' => new ResourceLoaderFileModule( array(
-		'scripts' => 'skins/common/wikibits.js',
+	),
+	'mediawiki.legacy.wikibits' => array(
+		'scripts' => 'common/wikibits.js',
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+		'dependencies' => 'mediawiki.language',
 		'messages' => array( 'showtoc', 'hidetoc' ),
-	) ),
-	'mediawiki.legacy.wikiprintable' => new ResourceLoaderFileModule( array(
-		'styles' => array( 'skins/common/wikiprintable.css' => array( 'media' => 'print' ) ),
-	) ),
-);
\ No newline at end of file
+	),
+	'mediawiki.legacy.wikiprintable' => array(
+		'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => "{$GLOBALS['IP']}/skins",
+	),
+);