From da2244279ec6b92e70bdbab5a6d8c7d98d42bcfe Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 16 Nov 2012 13:52:32 +0200 Subject: [PATCH 1/4] Whitespace and quotes --- src/jquery.uls.core.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index a7c4680..a5f7192 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -18,8 +18,8 @@ * @licence MIT License */ -(function ( $ ) { - "use strict"; +( function ( $ ) { + 'use strict'; // Region numbers in id attributes also appear in the langdb. var template = '\ @@ -86,7 +86,7 @@ for ( var code in this.languages ) { if ( $.uls.data.languages[code] === undefined ) { if ( window.console && window.console.log ) { - window.console.log( "ULS: Unknown language " + code + "." ); + window.console.log( 'ULS: Unknown language ' + code + '.' ); } delete this.languages[code]; } @@ -213,7 +213,7 @@ that.$languageFilter.on( 'seachclear', $.proxy( that.defaultSearch, that ) ); // Handle click on close button - this.$menu.find( "#uls-close" ).on( 'click', $.proxy( that.cancel, that ) ); + this.$menu.find( '#uls-close' ).on( 'click', $.proxy( that.cancel, that ) ); // Handle key press events on the menu that.$menu.on('keypress', $.proxy(this.keypress, this) ) @@ -228,7 +228,7 @@ clickhandler: $.proxy( that.select, that ), lazyload: that.options.lazyload, source: that.$languageFilter - } ).data( "lcd" ); + } ).data( 'lcd' ); that.$languageFilter.languagefilter( { $target: lcd, From 05e4de402054cc1fa10034764c35d4d5e97f466c Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 16 Nov 2012 14:00:25 +0200 Subject: [PATCH 2/4] Renamed 'that' to 'uls' --- src/jquery.uls.core.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index a5f7192..8e3334a 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -206,61 +206,61 @@ */ listen: function() { var lcd, - that = this; + uls = this; // 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( 'seachclear', $.proxy( uls.defaultSearch, uls ) ); // Handle click on close button - this.$menu.find( '#uls-close' ).on( 'click', $.proxy( that.cancel, that ) ); + this.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) ); // 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) ); if ( this.eventSupported( 'keydown' ) ) { this.$menu.on( 'keydown', $.proxy( this.keypress, this ) ); } - lcd = that.$resultsView.lcd( { - languages: that.languages, - quickList: that.options.quickList, - clickhandler: $.proxy( that.select, that ), - lazyload: that.options.lazyload, - source: that.$languageFilter + lcd = uls.$resultsView.lcd( { + languages: uls.languages, + quickList: uls.options.quickList, + clickhandler: $.proxy( uls.select, uls ), + lazyload: uls.options.lazyload, + source: uls.$languageFilter } ).data( 'lcd' ); - that.$languageFilter.languagefilter( { + uls.$languageFilter.languagefilter( { $target: lcd, - languages: that.languages, + languages: uls.languages, success: function() { $( '.regionselector' ).removeClass( 'active' ); - that.success(); + uls.success(); }, noresults: function() { $( '.regionselector' ).removeClass( 'active' ); - that.noresults(); + uls.noresults(); }, - searchAPI: that.options.searchAPI, - onSelect: $.proxy( that.select, that ) + searchAPI: uls.options.searchAPI, + onSelect: $.proxy( uls.select, uls ) } ); // Create region selectors, one per region this.$menu.find( '.uls-region, .uls-region-link' ).regionselector( { $target: lcd, - languages: that.languages, + languages: uls.languages, success: function( regionfilter ) { // Deactivate search filtering - that.$languageFilter.languagefilter( 'deactivate' ); + uls.$languageFilter.languagefilter( 'deactivate' ); // If it is WW region, show the quicklist if ( regionfilter.regionGroup === 1 ) { lcd.quicklist(); } // Show 'results view' if we are in no results mode - that.success(); + uls.success(); }, noresults: function() { - that.$languageFilter.languagefilter( 'clear' ); + uls.$languageFilter.languagefilter( 'clear' ); } } ); }, From 15d98ee58637389f2f5d4ab3222cc2350712081a Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 16 Nov 2012 14:08:03 +0200 Subject: [PATCH 3/4] Whitespace --- src/jquery.uls.core.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index 8e3334a..12bb08c 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -213,11 +213,11 @@ uls.$languageFilter.on( 'seachclear', $.proxy( uls.defaultSearch, uls ) ); // Handle click on close button - this.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) ); + uls.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) ); // Handle key press events on the menu - uls.$menu.on('keypress', $.proxy(this.keypress, this) ) - .on('keyup', $.proxy(this.keyup, this) ); + uls.$menu.on( 'keypress', $.proxy( this.keypress, this ) ) + .on( 'keyup', $.proxy( this.keyup, this ) ); if ( this.eventSupported( 'keydown' ) ) { this.$menu.on( 'keydown', $.proxy( this.keypress, this ) ); } From ba6a1e5eec4e3142d33439bc6f316d1648d39484 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 16 Nov 2012 14:09:45 +0200 Subject: [PATCH 4/4] Spelling of event name --- src/jquery.uls.core.js | 2 +- src/jquery.uls.languagefilter.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index 12bb08c..9f13493 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -211,7 +211,7 @@ // Register all event listeners to the ULS here. uls.$element.on( 'click', $.proxy( uls.click, uls ) ); - uls.$languageFilter.on( 'seachclear', $.proxy( uls.defaultSearch, uls ) ); + uls.$languageFilter.on( 'searchclear', $.proxy( uls.defaultSearch, uls ) ); // Handle click on close button uls.$menu.find( '#uls-close' ).on( 'click', $.proxy( uls.cancel, uls ) ); diff --git a/src/jquery.uls.languagefilter.js b/src/jquery.uls.languagefilter.js index fd44479..c1f8d55 100644 --- a/src/jquery.uls.languagefilter.js +++ b/src/jquery.uls.languagefilter.js @@ -117,7 +117,7 @@ */ clear: function() { this.deactivate(); - this.$element.trigger( 'seachclear' ); + this.$element.trigger( 'searchclear' ); }, /**