bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JSHint fixes

Browse Source 
* variables in one line
* double quote , single quote consistancy
* Unused variables

Change-Id: Id368190e7c4f46c8ef09deea88a0d5a7b32889ef
This commit is contained in:
Santhosh Thottingal
2012-10-16 16:55:53 +05:30
parent 400f401d4e
commit 7b30aa7f1a
2 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/js/ext.uls.geoclient.js
View File

@@ -18,7 +18,7 @@
*/ */
( function ( mw, $ ) { ( function ( mw, $ ) {
"use strict"; 'use strict';
mw.uls = mw.uls || {}; mw.uls = mw.uls || {};
mw.uls.setGeo = function ( data ) { mw.uls.setGeo = function ( data ) {
@@ -26,13 +26,14 @@
}; };
mw.uls.getCountryCode = function () { mw.uls.getCountryCode = function () {
/*jshint camelcase: false*/
return window.GEO && ( window.GEO.country || window.GEO.country_code ); return window.GEO && ( window.GEO.country || window.GEO.country_code );
}; };
var settings = { var settings = {
cache: true, cache: true,
dataType: "jsonp", dataType: 'jsonp',
jsonpCallback: "mw.uls.setGeo" jsonpCallback: 'mw.uls.setGeo'
}; };
$.ajax( mw.config.get( 'wgULSGeoService' ), settings ); $.ajax( mw.config.get( 'wgULSGeoService' ), settings );

68
resources/js/ext.uls.init.js
View File

@@ -18,12 +18,12 @@
*/ */
( function ( $, mw, window, document, undefined ) { ( function ( $, mw, window, document, undefined ) {
"use strict"; 'use strict';
// MediaWiki override for ULS defaults. // MediaWiki override for ULS defaults.
$.fn.uls.defaults = $.extend( $.fn.uls.defaults, { $.fn.uls.defaults = $.extend( $.fn.uls.defaults, {
languages: mw.config.get( 'wgULSLanguages' ), languages: mw.config.get( 'wgULSLanguages' ),
searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch" searchAPI: mw.util.wikiScript( 'api' ) + '?action=languagesearch'
} ); } );
var currentLang = mw.config.get( 'wgUserLanguage' ); var currentLang = mw.config.get( 'wgUserLanguage' );
@@ -59,7 +59,7 @@
}; };
mw.uls.getAcceptLanguageList = function () { mw.uls.getAcceptLanguageList = function () {
return mw.config.get( "wgULSAcceptLanguageList" ); return mw.config.get( 'wgULSAcceptLanguageList' );
}; };
mw.uls.getFrequentLanguageList = function () { mw.uls.getFrequentLanguageList = function () {
@@ -83,7 +83,7 @@
} ); } );
// Filter out unknown and unsupported languages // Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode, index ) { unique = $.grep( unique, function ( langCode ) {
return $.fn.uls.defaults.languages[langCode]; return $.fn.uls.defaults.languages[langCode];
} ); } );
@@ -91,34 +91,38 @@
}; };
$( document ).ready( function () { $( document ).ready( function () {
var extensionPath = mw.config.get( 'wgExtensionAssetsPath' ) var extensionPath, i18n, $ulsTrigger, previousLanguages, previousLang;
extensionPath = mw.config.get( 'wgExtensionAssetsPath' )
+ '/UniversalLanguageSelector/'; + '/UniversalLanguageSelector/';
// i18n initialization // i18n initialization
var i18n = $.i18n( { i18n = $.i18n( {
locale: currentLang, locale: currentLang,
messageLocationResolver: function ( locale ) { messageLocationResolver: function ( locale ) {
return extensionPath + 'i18n/' + locale + '.json'; return extensionPath + 'i18n/' + locale + '.json';
} }
} ); } );
// localization for jquery.uls // localization for jquery.uls
i18n.load( extensionPath + 'lib/jquery.uls/i18n/' + currentLang + ".json", currentLang ); i18n.load( extensionPath + 'lib/jquery.uls/i18n/' + currentLang + '.json', currentLang );
// localization for jquery.uls- fallback locale // localization for jquery.uls- fallback locale
i18n.load( extensionPath + 'lib/jquery.uls/i18n/en.json', 'en' ); i18n.load( extensionPath + 'lib/jquery.uls/i18n/en.json', 'en' );
// localization for mediaWiki ULS // localization for mediaWiki ULS
i18n.load( extensionPath + 'i18n/' + currentLang + ".json", currentLang ); i18n.load( extensionPath + 'i18n/' + currentLang + '.json', currentLang );
// localization for mediaWiki ULS- fallback locale // localization for mediaWiki ULS- fallback locale
i18n.load( extensionPath + 'i18n/en.json', 'en' ); i18n.load( extensionPath + 'i18n/en.json', 'en' );
var $ulsTrigger = $( '.uls-trigger' ), $ulsTrigger = $( '.uls-trigger' );
previousLanguages = mw.uls.getPreviousLanguages() || [], previousLanguages = mw.uls.getPreviousLanguages() || [];
previousLang = previousLanguages.slice( -1 )[0]; previousLang = previousLanguages.slice( -1 )[0];
function displaySettings () { function displaySettings () {
var $displaySettingsTitle = $( '<div data-i18n="ext-uls-display-settings-title">' ) var $displaySettingsTitle, $displaySettingsText, $displaySettings;
$displaySettingsTitle = $( '<div data-i18n="ext-uls-display-settings-title">' )
.addClass( 'settings-title' ); .addClass( 'settings-title' );
var $displaySettingsText = $( '<span data-i18n="ext-uls-display-settings-desc">' ) $displaySettingsText = $( '<span data-i18n="ext-uls-display-settings-desc">' )
.addClass( 'settings-text' ); .addClass( 'settings-text' );
var $displaySettings = $( '<div>' ) $displaySettings = $( '<div>' )
.addClass( 'display-settings-block' ) .addClass( 'display-settings-block' )
.prop( 'id', 'display-settings-block' ) .prop( 'id', 'display-settings-block' )
.append( $displaySettingsTitle ) .append( $displaySettingsTitle )
@@ -127,9 +131,12 @@
} }
function addDisplaySettings ( uls ) { function addDisplaySettings ( uls ) {
var $displaySettings = displaySettings(); var $displaySettings, position;
uls.$menu.find( "div#settings-block" ).append( $displaySettings );
var position = uls.position(); $displaySettings = displaySettings();
uls.$menu.find( 'div#settings-block' ).append( $displaySettings );
position = uls.position();
$displaySettings.languagesettings( { $displaySettings.languagesettings( {
defaultModule: 'display', defaultModule: 'display',
onClose: function () { onClose: function () {
@@ -138,6 +145,7 @@
top: position.top, top: position.top,
left: position.left left: position.left
} ); } );
$displaySettings.on( 'click', function () { $displaySettings.on( 'click', function () {
uls.hide(); uls.hide();
} ); } );
@@ -151,7 +159,7 @@
mw.uls.changeLanguage( language ); mw.uls.changeLanguage( language );
}, },
languages: mw.config.get( 'wgULSLanguages' ), languages: mw.config.get( 'wgULSLanguages' ),
searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch", searchAPI: mw.util.wikiScript( 'api' ) + '?action=languagesearch',
quickList: function () { quickList: function () {
return mw.uls.getFrequentLanguageList(); return mw.uls.getFrequentLanguageList();
} }
@@ -171,6 +179,7 @@
previousLanguages.push( currentLang ); previousLanguages.push( currentLang );
mw.uls.setPreviousLanguages( previousLanguages ); mw.uls.setPreviousLanguages( previousLanguages );
// Attach a tipsy tooltip to the trigger // Attach a tipsy tooltip to the trigger
$ulsTrigger.tipsy( { $ulsTrigger.tipsy( {
gravity: 'n', gravity: 'n',
@@ -179,24 +188,27 @@
fade: true, fade: true,
trigger: 'manual', trigger: 'manual',
title: function () { title: function () {
var prevLangName = $.uls.data.getAutonym( previousLang ); var prevLangName, linkClass, prevLangLink, title;
var linkClass = 'uls-prevlang-link';
var prevLangLink = "<a href='#' lang = '" + prevLangName = $.uls.data.getAutonym( previousLang );
previousLang + "' class = '" + linkClass + "' >" + linkClass = 'uls-prevlang-link';
prevLangName + "</a>"; prevLangLink = '<a href="#" lang = "' +
var title = $.i18n( "ext-uls-undo-language-tooltip-text", prevLangLink ); previousLang + '" class = "' + linkClass + '" >' +
prevLangName + '</a>';
title = $.i18n( 'ext-uls-undo-language-tooltip-text', prevLangLink );
return title; return title;
} }
} ); } );
function showTipsy( timeout ) { function showTipsy( timeout ) {
var tipsyTimer; var tipsyTimer = 0;
$ulsTrigger.tipsy( 'show' ); $ulsTrigger.tipsy( 'show' );
// if the mouse is over the tooltip, do not hide // if the mouse is over the tooltip, do not hide
$( '.tipsy' ).on( 'mouseover', function ( e ) { $( '.tipsy' ).on( 'mouseover', function () {
window.clearTimeout( tipsyTimer ); window.clearTimeout( tipsyTimer );
} ); } );
$( '.tipsy' ).on( 'mouseout', function ( e ) { $( '.tipsy' ).on( 'mouseout', function () {
tipsyTimer = window.setTimeout( function () { tipsyTimer = window.setTimeout( function () {
hideTipsy(); hideTipsy();
}, timeout ); }, timeout );
@@ -218,11 +230,11 @@
showTipsy( 6000 ); showTipsy( 6000 );
// manually show the tooltip // manually show the tooltip
$ulsTrigger.on( 'mouseover', function ( e ) { $ulsTrigger.on( 'mouseover', function () {
showTipsy( 3000 ); showTipsy( 3000 );
} ); } );
// hide the tooltip when clicked on uls trigger // hide the tooltip when clicked on uls trigger
$ulsTrigger.on( 'click', function ( e ) { $ulsTrigger.on( 'click', function () {
hideTipsy(); hideTipsy();
} ); } );
} ); } );