bryce/jquery.uls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from amire80/cleanup/2012/11/16

Browse Source 
Cleanup/2012/11/16
This commit is contained in:
Santhosh Thottingal
2012-11-16 04:24:04 -08:00
parent 05d003531f ba6a1e5eec
commit b7bc685d80
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/jquery.uls.core.js
View File

@@ -18,8 +18,8 @@
* @licence MIT License * @licence MIT License
*/ */
(function ( $ ) { ( function ( $ ) {
"use strict"; 'use strict';
// Region numbers in id attributes also appear in the langdb. // Region numbers in id attributes also appear in the langdb.
var template = '\ var template = '\
@@ -86,7 +86,7 @@
for ( var code in this.languages ) { for ( var code in this.languages ) {
if ( $.uls.data.languages[code] === undefined ) { if ( $.uls.data.languages[code] === undefined ) {
if ( window.console && window.console.log ) { if ( window.console && window.console.log ) {
window.console.log( "ULS: Unknown language " + code + "." ); window.console.log( 'ULS: Unknown language ' + code + '.' );
} }
delete this.languages[code]; delete this.languages[code];
} }
@@ -206,61 +206,61 @@
*/ */
listen: function() { listen: function() {
var lcd, var lcd,
that = this; uls = this;
// Register all event listeners to the ULS here. // Register all event listeners to the ULS here.
that.$element.on( 'click', $.proxy( that.click, that ) ); uls.$element.on( 'click', $.proxy( uls.click, uls ) );
that.$languageFilter.on( 'seachclear', $.proxy( that.defaultSearch, that ) ); uls.$languageFilter.on( 'searchclear', $.proxy( uls.defaultSearch, uls ) );
// Handle click on close button // Handle click on close button
this.$menu.find( "#uls-close" ).on( 'click', $.proxy( that.cancel, that ) ); uls.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) );
// Handle key press events on the menu // Handle key press events on the menu
that.$menu.on('keypress', $.proxy(this.keypress, this) ) uls.$menu.on( 'keypress', $.proxy( this.keypress, this ) )
.on('keyup', $.proxy(this.keyup, this) ); .on( 'keyup', $.proxy( this.keyup, this ) );
if ( this.eventSupported( 'keydown' ) ) { if ( this.eventSupported( 'keydown' ) ) {
this.$menu.on( 'keydown', $.proxy( this.keypress, this ) ); this.$menu.on( 'keydown', $.proxy( this.keypress, this ) );
} }
lcd = that.$resultsView.lcd( { lcd = uls.$resultsView.lcd( {
languages: that.languages, languages: uls.languages,
quickList: that.options.quickList, quickList: uls.options.quickList,
clickhandler: $.proxy( that.select, that ), clickhandler: $.proxy( uls.select, uls ),
lazyload: that.options.lazyload, lazyload: uls.options.lazyload,
source: that.$languageFilter source: uls.$languageFilter
} ).data( "lcd" ); } ).data( 'lcd' );
that.$languageFilter.languagefilter( { uls.$languageFilter.languagefilter( {
$target: lcd, $target: lcd,
languages: that.languages, languages: uls.languages,
success: function() { success: function() {
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
that.success(); uls.success();
}, },
noresults: function() { noresults: function() {
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
that.noresults(); uls.noresults();
}, },
searchAPI: that.options.searchAPI, searchAPI: uls.options.searchAPI,
onSelect: $.proxy( that.select, that ) onSelect: $.proxy( uls.select, uls )
} ); } );
// Create region selectors, one per region // Create region selectors, one per region
this.$menu.find( '.uls-region, .uls-region-link' ).regionselector( { this.$menu.find( '.uls-region, .uls-region-link' ).regionselector( {
$target: lcd, $target: lcd,
languages: that.languages, languages: uls.languages,
success: function( regionfilter ) { success: function( regionfilter ) {
// Deactivate search filtering // Deactivate search filtering
that.$languageFilter.languagefilter( 'deactivate' ); uls.$languageFilter.languagefilter( 'deactivate' );
// If it is WW region, show the quicklist // If it is WW region, show the quicklist
if ( regionfilter.regionGroup === 1 ) { if ( regionfilter.regionGroup === 1 ) {
lcd.quicklist(); lcd.quicklist();
} }
// Show 'results view' if we are in no results mode // Show 'results view' if we are in no results mode
that.success(); uls.success();
}, },
noresults: function() { noresults: function() {
that.$languageFilter.languagefilter( 'clear' ); uls.$languageFilter.languagefilter( 'clear' );
} }
} ); } );
}, },

2
src/jquery.uls.languagefilter.js
View File

@@ -117,7 +117,7 @@
*/ */
clear: function() { clear: function() {
this.deactivate(); this.deactivate();
this.$element.trigger( 'seachclear' ); this.$element.trigger( 'searchclear' );
}, },
/** /**