Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/55865
Change subject: Sort modules alphabetically ...................................................................... Sort modules alphabetically Change-Id: Id8a0daabe6204e2a4c52d702e29d891fd80b89ae --- M Resources.php 1 file changed, 67 insertions(+), 69 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/65/55865/1 diff --git a/Resources.php b/Resources.php index 6b7c725..8bde270 100644 --- a/Resources.php +++ b/Resources.php @@ -6,6 +6,34 @@ * @license GPL2+ */ +$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', +); + +$wgResourceModules['ext.uls.geoclient'] = array( + 'scripts' => 'resources/js/ext.uls.geoclient.js', + 'localBasePath' => $dir, + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +$wgResourceModules['ext.uls.ime'] = array( + 'scripts' => 'resources/js/ext.uls.ime.js', + 'localBasePath' => $dir, + 'remoteExtPath' => 'UniversalLanguageSelector', + 'dependencies' => array( + 'jquery.ime', + 'ext.uls.preferences', + ), +); + // Base ULS module $wgResourceModules['ext.uls.init'] = array( 'scripts' => 'resources/js/ext.uls.init.js', @@ -22,6 +50,18 @@ 'position' => 'top', ); +$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', +); + // Interface language selection module $wgResourceModules['ext.uls.interface'] = array( 'scripts' => 'resources/js/ext.uls.interface.js', @@ -36,10 +76,14 @@ 'position' => 'top', ); -$wgResourceModules['ext.uls.geoclient'] = array( - 'scripts' => 'resources/js/ext.uls.geoclient.js', +$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', + ), ); $wgResourceModules['ext.uls.preferences'] = array( @@ -53,16 +97,6 @@ ), ); -$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', - ), -); - $wgResourceModules['ext.uls.webfonts'] = array( 'scripts' => 'resources/js/ext.uls.webfonts.js', 'localBasePath' => $dir, @@ -73,38 +107,25 @@ 'ext.uls.preferences', ), ); -$wgResourceModules['ext.uls.ime'] = array( - 'scripts' => 'resources/js/ext.uls.ime.js', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', - 'dependencies' => array( - 'jquery.ime', - 'ext.uls.preferences', - ), -); - -$wgResourceModules['ext.uls.displaysettings'] = array( - 'scripts' => 'resources/js/ext.uls.displaysettings.js', - 'styles' => 'resources/css/ext.uls.displaysettings.css', +$wgResourceModules['ext.uls.webfonts.repository'] = array( + 'scripts' => 'resources/js/ext.uls.webfonts.repository.js', 'localBasePath' => $dir, - 'dependencies' => array( - 'ext.uls.languagesettings', - 'ext.uls.webfonts', - 'jquery.i18n', - ), 'remoteExtPath' => 'UniversalLanguageSelector', ); -$wgResourceModules['ext.uls.inputsettings'] = array( - 'scripts' => 'resources/js/ext.uls.inputsettings.js', - 'styles' => 'resources/css/ext.uls.inputsettings.css', +$wgResourceModules['jquery.i18n'] = array( + 'scripts' => 'lib/jquery.i18n.js', 'localBasePath' => $dir, - 'dependencies' => array( - 'ext.uls.languagesettings', - 'ext.uls.ime', - 'jquery.i18n', + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +$wgResourceModules['jquery.ime'] = array( + 'scripts' => 'lib/jquery.ime/jquery.ime.js', + 'styles' => array( + 'lib/jquery.ime/css/jquery.ime.css', ), + 'localBasePath' => $dir, 'remoteExtPath' => 'UniversalLanguageSelector', ); @@ -129,17 +150,6 @@ 'position' => 'top', ); - -$wgResourceModules['jquery.uls.grid'] = array( - 'styles' => array( - 'lib/jquery.uls/css/jquery.uls.grid.css', - ), - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', - 'position' => 'top', -); - - $wgResourceModules['jquery.uls.compact'] = array( 'styles' => array( 'lib/jquery.uls/css/jquery.uls.compact.css', @@ -162,29 +172,17 @@ 'position' => 'top', ); +$wgResourceModules['jquery.uls.grid'] = array( + 'styles' => array( + 'lib/jquery.uls/css/jquery.uls.grid.css', + ), + 'localBasePath' => $dir, + 'remoteExtPath' => 'UniversalLanguageSelector', + 'position' => 'top', +); + $wgResourceModules['jquery.webfonts'] = array( 'scripts' => 'lib/jquery.webfonts.js', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', -); - -$wgResourceModules['ext.uls.webfonts.repository'] = array( - 'scripts' => 'resources/js/ext.uls.webfonts.repository.js', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', -); - -$wgResourceModules['jquery.i18n'] = array( - 'scripts' => 'lib/jquery.i18n.js', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', -); - -$wgResourceModules['jquery.ime'] = array( - 'scripts' => 'lib/jquery.ime/jquery.ime.js', - 'styles' => array( - 'lib/jquery.ime/css/jquery.ime.css', - ), 'localBasePath' => $dir, 'remoteExtPath' => 'UniversalLanguageSelector', ); -- To view, visit https://gerrit.wikimedia.org/r/55865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8a0daabe6204e2a4c52d702e29d891fd80b89ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits