Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55866
Change subject: Add $resourcePaths
......................................................................
Add $resourcePaths
Change-Id: I2b3ef5f57566fe5bcc6549157e09c47fdc61e95f
---
M Resources.php
1 file changed, 22 insertions(+), 51 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/66/55866/1
diff --git a/Resources.php b/Resources.php
index 8bde270..2dd3b74 100644
--- a/Resources.php
+++ b/Resources.php
@@ -6,40 +6,37 @@
* @license GPL2+
*/
+$resourcePaths = array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => 'UniversalLanguageSelector'
+) + $resourcePaths;
+
$wgResourceModules['ext.uls.displaysettings'] = array(
'scripts' => 'resources/js/ext.uls.displaysettings.js',
'styles' => 'resources/css/ext.uls.displaysettings.css',
- 'localBasePath' => $dir,
'dependencies' => array(
'ext.uls.languagesettings',
'ext.uls.webfonts',
'jquery.i18n',
),
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.geoclient'] = array(
'scripts' => 'resources/js/ext.uls.geoclient.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.ime'] = array(
'scripts' => 'resources/js/ext.uls.ime.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'jquery.ime',
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
// Base ULS module
$wgResourceModules['ext.uls.init'] = array(
'scripts' => 'resources/js/ext.uls.init.js',
'styles' => 'resources/css/ext.uls.css',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'mediawiki.Uri',
'mediawiki.util',
@@ -48,25 +45,21 @@
'jquery.i18n',
),
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.inputsettings'] = array(
'scripts' => 'resources/js/ext.uls.inputsettings.js',
'styles' => 'resources/css/ext.uls.inputsettings.css',
- 'localBasePath' => $dir,
'dependencies' => array(
'ext.uls.languagesettings',
'ext.uls.ime',
'jquery.i18n',
),
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
// Interface language selection module
$wgResourceModules['ext.uls.interface'] = array(
'scripts' => 'resources/js/ext.uls.interface.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'ext.uls.init',
'jquery.tipsy',
@@ -74,60 +67,48 @@
'ext.uls.inputsettings',
),
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.languagesettings'] = array(
'scripts' => 'resources/js/ext.uls.languagesettings.js',
'styles' => 'resources/css/ext.uls.languagesettings.css',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.preferences'] = array(
'scripts' => 'resources/js/ext.uls.preferences.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'mediawiki.user',
'mediawiki.api',
'jquery.jStorage',
),
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.webfonts'] = array(
'scripts' => 'resources/js/ext.uls.webfonts.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'jquery.webfonts',
'ext.uls.webfonts.repository',
'ext.uls.preferences',
),
-);
+) + $resourcePaths;
$wgResourceModules['ext.uls.webfonts.repository'] = array(
'scripts' => 'resources/js/ext.uls.webfonts.repository.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.i18n'] = array(
'scripts' => 'lib/jquery.i18n.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.ime'] = array(
'scripts' => 'lib/jquery.ime/jquery.ime.js',
'styles' => array(
'lib/jquery.ime/css/jquery.ime.css',
),
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.uls'] = array(
'scripts' => array(
@@ -140,49 +121,39 @@
'lib/jquery.uls/css/jquery.uls.css',
'lib/jquery.uls/css/jquery.uls.lcd.css',
),
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'jquery.i18n',
'jquery.uls.grid',
'jquery.uls.data',
),
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.uls.compact'] = array(
'styles' => array(
'lib/jquery.uls/css/jquery.uls.compact.css',
),
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'dependencies' => array(
'jquery.uls',
),
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.uls.data'] = array(
'scripts' => array(
'lib/jquery.uls/src/jquery.uls.data.js',
'lib/jquery.uls/src/jquery.uls.data.utils.js',
),
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.uls.grid'] = array(
'styles' => array(
'lib/jquery.uls/css/jquery.uls.grid.css',
),
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
'position' => 'top',
-);
+) + $resourcePaths;
$wgResourceModules['jquery.webfonts'] = array(
'scripts' => 'lib/jquery.webfonts.js',
- 'localBasePath' => $dir,
- 'remoteExtPath' => 'UniversalLanguageSelector',
-);
+) + $resourcePaths;
--
To view, visit https://gerrit.wikimedia.org/r/55866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b3ef5f57566fe5bcc6549157e09c47fdc61e95f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
