Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Fix for issue 5198 #5419

Merged
merged 2 commits into from
Jan 9, 2013
Merged

Fix for issue 5198 #5419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03775e9
Listview Filter: Prevent onKeyUp handler to be called twice for the s…
gseguin Jan 4, 2013
88e86a1
Listview test: Added test case for issue #5198
gseguin Jan 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions js/widgets/listview.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@ $( document ).delegate( "ul, ol", "listviewcreate", function() {
e.preventDefault();
search.blur();
}),
search = $( "<input>", {
placeholder: listview.options.filterPlaceholder
})
.attr( "data-" + $.mobile.ns + "type", "search" )
.jqmData( "lastval", "" )
.bind( "keyup change input", function() {

onKeyUp = function( e ) {
var $this = $( this ),
val = this.value.toLowerCase(),
listItems = null,
Expand All @@ -57,6 +51,11 @@ $( document ).delegate( "ul, ol", "listviewcreate", function() {
// Check if a custom filter callback applies
isCustomFilterCallback = listview.options.filterCallback !== defaultFilterCallback;

if ( lastval && lastval === val ) {
// Execute the handler only once per value change
return;
}

listview._trigger( "beforefilter", "beforefilter", { input: this } );

// Change val as lastval for next execution
Expand Down Expand Up @@ -119,7 +118,13 @@ $( document ).delegate( "ul, ol", "listviewcreate", function() {
listItems.toggleClass( "ui-screen-hidden", !!listview.options.filterReveal );
}
listview._addFirstLastClasses( li, listview._getVisibles( li, false ), false );
},
search = $( "<input>", {
placeholder: listview.options.filterPlaceholder
})
.attr( "data-" + $.mobile.ns + "type", "search" )
.jqmData( "lastval", "" )
.bind( "keyup change input", onKeyUp )
.appendTo( wrapper )
.textinput();

Expand Down
28 changes: 28 additions & 0 deletions tests/unit/listview/listview_core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,34 @@
]);
});

asyncTest( "event listviewbeforefilter firing", function() {
var $searchPage = $( searchFilterId );
$.testHelper.pageSequence([
function() {
$.mobile.changePage( searchFilterId );
},

function() {
var beforeFilterCount = 0;
$searchPage.on( "listviewbeforefilter", function( e ) {
beforeFilterCount += 1;
});
$searchPage.find( 'input' ).val( "a" );
$searchPage.find( 'input' ).trigger('input');
$searchPage.find( 'input' ).trigger('keyup');
$searchPage.find( 'input' ).trigger('change');
equal( beforeFilterCount, 1, "listviewbeforefilter should fire only once for the same value" );

$searchPage.find( 'input' ).val( "ab" );
$searchPage.find( 'input' ).trigger('input');
$searchPage.find( 'input' ).trigger('keyup');
equal( beforeFilterCount, 2, "listviewbeforefilter should fire twice since value has changed" );

start();
}
]);
});

test( "Refresh applies thumb styling", function(){
var ul = $('.ui-page-active ul');

Expand Down