After training the PHPStorm code formatter.

See https://github.com/siebrand/MediaWiki-PHPStorm

Issue remains with anonymous functions in JavaScript.

Change-Id: I2b520f8df127452acf02deb659277a6465e6ca59

resources/css/ext.uls.css

@@ -82,8 +82,7 @@ button.button.down {
 button.button:disabled,
 button.button.hover:disabled,
 button.button.disabled,
-button.button.disabled:hover
-	{
+button.button.disabled:hover {
 	background-color: #F0F0F0;
 	background-image: -webkit-linear-gradient(top, #f0f0f0, #f0f0f0);
 	background-image: -moz-linear-gradient(center top, #F0F0F0, #F0F0F0);

resources/css/ext.uls.displaysettings.css

@@ -1,4 +1,4 @@
-.uls-font-label,.uls-font-select {
+.uls-font-label, .uls-font-select {
 	font-size: 10pt;
 	line-height: 16pt;
 }
@@ -17,11 +17,11 @@
 	width: auto;
 }
 
-.uls-content-fonts,.uls-ui-fonts {
+.uls-content-fonts, .uls-ui-fonts {
 	padding-top: 10px;
 }
 
-.uls-content-fonts:hover,.uls-ui-fonts:hover {
+.uls-content-fonts:hover, .uls-ui-fonts:hover {
 	background-color: #F6F6F6;
 }
 

resources/css/ext.uls.languagesettings.css

@@ -1,6 +1,5 @@
 #uls-current-language-nav { /* @embed */
-	background: url('../images/cog-16x16-ltr.png') no-repeat scroll right
-		top transparent;
+	background: url('../images/cog-16x16-ltr.png') no-repeat scroll right top transparent;
 	cursor: pointer;
 }
 
@@ -93,7 +92,6 @@
 	border-left-color: #3366BB;
 }
 
-
 #languagesettings-panels div#settings-block {
 	border-left: 1px solid #C9C9C9;
 	padding-left: 10px;

resources/js/ext.uls.displaysettings.js

@@ -17,39 +17,39 @@
  * @licence MIT License
  */
 
-( function( $, mw, undefined ) {
+( function ( $, mw, undefined ) {
 	"use strict";
 
 	var template = '<div class="row"><div class="twelve columns"><h3>Display settings</h3></div></div>'
-			+ '<div class="row"><div class="eleven columns"><h4>Language used for menus</h4></div></div>'
-			+ '<div class="row"><div class="uls-ui-languages eleven columns">'
-			+ '</div></div>'
-			+ '<div class="row"><div class="twelve columns"><h4>Font settings</h4></div></div>'
-			+ '<div class="row">'
-			+ '<div class="eleven columns">'
-			+ '<label class="checkbox"><input type="checkbox" id="webfonts-enable-checkbox" />'
-			+ '<strong>Download fonts automatically when needed</strong> '
-			+ 'Web fonts will be downloaded when text in special scripts is displayed. '
-			+ '<a target="_blank" href="//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:WebFonts">More information</a>'
-			+ '</span></label>'
-			+ '</div>'
-			+ '</div>'
-			+ '<div class="row"><h5 class="twelve columns">Select your preferred fonts</h5></div>'
-			+ '<div class="row uls-content-fonts">'
-			+ '<div class="six columns"><label class="uls-font-label" id="content-font-selector-label"></label></div>'
-			+ '<select id="content-font-selector" class="four columns end uls-font-select"></select>'
-			+ '</div>'
-			+ '<div class="row uls-ui-fonts">'
-			+ '<div class="six columns"><label class="uls-font-label" id="ui-font-selector-label"></label></div>'
-			+ '<select id="ui-font-selector" class="four columns end uls-font-select"></select>'
-			+ '</div>'
-			+ '<div class="row"></div>'
-			+ '<div class="row language-settings-buttons">'
-			+ '<div class="eleven columns">'
-			+ '<button class="button uls-settings-close">Cancel</button>'
-			+ '<button id="uls-displaysettings-apply" class="active blue button">Apply changes</button>'
-			+ '</div>'
-			+ '</div>'; // FIXME i18n and too much hardcoding.
+		+ '<div class="row"><div class="eleven columns"><h4>Language used for menus</h4></div></div>'
+		+ '<div class="row"><div class="uls-ui-languages eleven columns">'
+		+ '</div></div>'
+		+ '<div class="row"><div class="twelve columns"><h4>Font settings</h4></div></div>'
+		+ '<div class="row">'
+		+ '<div class="eleven columns">'
+		+ '<label class="checkbox"><input type="checkbox" id="webfonts-enable-checkbox" />'
+		+ '<strong>Download fonts automatically when needed</strong> '
+		+ 'Web fonts will be downloaded when text in special scripts is displayed. '
+		+ '<a target="_blank" href="//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:WebFonts">More information</a>'
+		+ '</span></label>'
+		+ '</div>'
+		+ '</div>'
+		+ '<div class="row"><h5 class="twelve columns">Select your preferred fonts</h5></div>'
+		+ '<div class="row uls-content-fonts">'
+		+ '<div class="six columns"><label class="uls-font-label" id="content-font-selector-label"></label></div>'
+		+ '<select id="content-font-selector" class="four columns end uls-font-select"></select>'
+		+ '</div>'
+		+ '<div class="row uls-ui-fonts">'
+		+ '<div class="six columns"><label class="uls-font-label" id="ui-font-selector-label"></label></div>'
+		+ '<select id="ui-font-selector" class="four columns end uls-font-select"></select>'
+		+ '</div>'
+		+ '<div class="row"></div>'
+		+ '<div class="row language-settings-buttons">'
+		+ '<div class="eleven columns">'
+		+ '<button class="button uls-settings-close">Cancel</button>'
+		+ '<button id="uls-displaysettings-apply" class="active blue button">Apply changes</button>'
+		+ '</div>'
+		+ '</div>'; // FIXME i18n and too much hardcoding.
 
 	var DisplaySettings = function ( $parent ) {
 		this.name = "Display";
@@ -236,7 +236,7 @@
 			$systemFont.attr( 'selected', savedFont === 'system' || !savedFont );
 			var $fontLabel = this.$template.find( 'label#ui-font-selector-label' );
 			$fontLabel.html( "<strong>Select font for " + $.uls.data.autonym( this.uiLanguage )
-					+ "</strong><div>Used for menus</div>" );
+				+ "</strong><div>Used for menus</div>" );
 		},
 
 		/**
@@ -264,7 +264,7 @@
 			$systemFont.attr( 'selected', savedFont === 'system' || !savedFont );
 			var $fontLabel = this.$template.find( '#content-font-selector-label' );
 			$fontLabel.html( "<strong>Select font for " + $.uls.data.autonym( this.contentLanguage )
-					+ "</strong><div>Used for content</div>" );
+				+ "</strong><div>Used for content</div>" );
 		},
 
 		/**
@@ -326,7 +326,7 @@
 		 * Close the language settings window.
 		 * Depending on the context, actions vary.
 		 */
-		close:  function () {
+		close: function () {
 			this.$parent.close();
 		},
 

resources/js/ext.uls.geoclient.js

@@ -17,7 +17,7 @@
  * @licence MIT License
  */
 
-( function( mw, $ ) {
+( function ( mw, $ ) {
 	"use strict";
 
 	mw.uls = mw.uls || {};

resources/js/ext.uls.init.js

@@ -26,7 +26,6 @@
 		searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch"
 	} );
 
-
 	var currentLang = mw.config.get( 'wgUserLanguage' );
 	mw.uls = mw.uls || {};
 	mw.uls.previousLanguagesCookie = 'uls-previous-languages';
@@ -65,9 +64,11 @@
 
 	mw.uls.getFrequentLanguageList = function () {
 		var unique = [],
-			list = [ mw.config.get( 'wgUserLanguage' ),
+			list = [
+				mw.config.get( 'wgUserLanguage' ),
 				mw.config.get( 'wgContentLanguage' ),
-				mw.uls.getBrowserLanguage() ]
+				mw.uls.getBrowserLanguage()
+			]
 				.concat( mw.uls.getPreviousLanguages() )
 				.concat( mw.uls.getAcceptLanguageList() );
 		if ( window.GEO ) {
@@ -85,12 +86,12 @@
 		return unique;
 	};
 
-	$( document ).ready( function() {
+	$( document ).ready( function () {
 		var $ulsTrigger = $( '.uls-trigger' ),
 			previousLanguages = mw.uls.getPreviousLanguages() || [],
 			previousLang = previousLanguages.slice( -1 )[0];
 
-		function displaySettings() {
+		function displaySettings () {
 			var $displaySettingsTitle = $( '<div>' )
 					.addClass( 'settings-title' )
 					.text( 'Display settings' ),
@@ -105,7 +106,7 @@
 			return $displaySettings;
 		}
 
-		function addDisplaySettings( uls ) {
+		function addDisplaySettings ( uls ) {
 			var $displaySettings = displaySettings();
 			uls.$menu.find( "div#settings-block" ).append( $displaySettings );
 			var position = uls.position();
@@ -136,7 +137,6 @@
 			}
 		} );
 
-
 		if ( !previousLang ) {
 			previousLanguages.push( currentLang );
 			mw.uls.setPreviousLanguages( previousLanguages );
@@ -171,7 +171,7 @@
 		// Show the tipsy tooltip on page load.
 		$ulsTrigger.tipsy( 'show' );
 		tipsyTimer = window.setTimeout( function () {
-				$ulsTrigger.tipsy('hide');
+				$ulsTrigger.tipsy( 'hide' );
 			},
 			// The timeout after page reloading is longer,
 			// to give the user a better chance to see it.

resources/js/ext.uls.languagesettings.js

@@ -17,7 +17,7 @@
  * @licence MIT License
  */
 
-( function( $ ) {
+( function ( $ ) {
 	"use strict";
 
 	var closeRow = '<div class="row">' +
@@ -34,10 +34,10 @@
 		settingsMenu +
 		settingsPanel +
 		'</div>';
-	var windowTemplate = '<div style="display: block;" id="language-settings-dialog" class="uls-menu">' +
-		closeRow +
-		panelsRow +
-		'</div>';
+	var windowTemplate = '<div style="display: block;" id="language-settings-dialog" class="uls-menu">'
+		+ closeRow
+		+ panelsRow
+		+ '</div>';
 
 	var LanguageSettings = function ( element, options ) {
 		this.$element = $( element );
@@ -144,7 +144,7 @@
 		 * Will be used when moving to a different context and
 		 * need coming back.
 		 */
-		hide: function() {
+		hide: function () {
 			this.shown = false;
 			this.$window.hide();
 		},
@@ -153,14 +153,14 @@
 		 * Close this language settings window, and
 		 * call onClose if defined from the previous context.
 		 */
-		close: function() {
+		close: function () {
 			this.hide();
 			if ( this.options.onClose ) {
 				this.options.onClose();
 			}
 		},
 
-		click: function( e ) {
+		click: function ( e ) {
 			if ( !this.shown ) {
 				this.show();
 			}

resources/js/ext.uls.webfonts.js

@@ -19,7 +19,7 @@
 ( function ( $, mw, document, undefined ) {
 	"use strict";
 
-	$( document ).ready( function() {
+	$( document ).ready( function () {
 		var mediawikiFontRepository = $.webfonts.repository;
 		var webfontsPreferences = mw.uls.preferences( 'webfonts' );
 		mediawikiFontRepository.base = mw.config.get( 'wgExtensionAssetsPath' )
@@ -43,7 +43,7 @@
 				}
 				return font;
 			},
-			exclude: function() {
+			exclude: function () {
 				if ( mw.user.options.get( 'editfont' ) ) {
 					// Exclude textboxes from webfonts if user has edit area font option
 					// set using 'Preferences' page