WebFonts integration with ULS display settings.

This does not add much functionality. That will come in
future commits.

This commit has many cleanup, refactoring on the display settings,
language settings code.

Change-Id: I7fbc3ebb9b67c1afd80f159c2d82cd2a1c6bea74

UniversalLanguageSelector.php

@@ -71,7 +71,7 @@ $wgResourceModules['ext.uls.init'] = array(
 		'mediawiki.Uri',
 		'jquery.tipsy',
 		'jquery.uls',
-		'ext.uls.languagesettings',
+		'ext.uls.displaysettings',
 	),
 	'position' => 'top',
 );
@@ -83,12 +83,21 @@ $wgResourceModules['ext.uls.languagesettings'] = array(
 	'remoteExtPath' => 'UniversalLanguageSelector',
 );
 
+$wgResourceModules['ext.uls.webfonts'] = array(
+	'scripts' => 'resources/js/ext.uls.webfonts.js',
+	'localBasePath' => $dir,
+	'remoteExtPath' => 'UniversalLanguageSelector',
+	'dependencies' => array(
+		'jquery.webfonts'
+	),
+);
+
 $wgResourceModules['ext.uls.displaysettings'] = array(
 	'scripts' => 'resources/js/ext.uls.displaysettings.js',
 	'localBasePath' => $dir,
 	'dependencies' => array(
 		'ext.uls.languagesettings',
-		'jquery.webfonts'
+		'ext.uls.webfonts'
 	),
 	'remoteExtPath' => 'UniversalLanguageSelector',
 );
@@ -128,7 +137,7 @@ $wgResourceModules['jquery.webfonts'] = array(
 );
 
 $wgResourceModules['ext.uls.webfonts.repository'] = array(
-		'scripts' => 'resources/js/jquery.webfonts.repository.js',
-		'localBasePath' => $dir,
-		'remoteExtPath' => 'UniversalLanguageSelector',
+	'scripts' => 'resources/js/jquery.webfonts.repository.js',
+	'localBasePath' => $dir,
+	'remoteExtPath' => 'UniversalLanguageSelector',
 );