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

"ListViewFilter:Fix Filter issue when using filters and collapsible lists. Fixed #5208 -Filter issue when using filters and collapsible lists" #5209

Closed
wants to merge 1 commit into from
Closed

"ListViewFilter:Fix Filter issue when using filters and collapsible lists. Fixed #5208 -Filter issue when using filters and collapsible lists" #5209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 49 additions & 0 deletions js/widgets/listview.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
childItems = false,
itemtext = "",
item,
listItemsCollapsible = null,
itemCollapsible,
itemtextCollapsible = "",
itemCollapsible,
// Check if a custom filter callback applies
isCustomFilterCallback = listview.options.filterCallback !== defaultFilterCallback;

Expand Down Expand Up @@ -91,6 +95,26 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(

//mark to be hidden
item.toggleClass( "ui-filter-hidequeue" , true );
} else if(listItems[i].className.indexOf("ui-collapsible") === 0) {

// Collapsible list
$(listItems[i].children[0].children).toggleClass("ui-filter-hidenqueue", true);
for ( var j = listItems[i].children[1].children.length - 1; j >= 0; j-- ) {
itemCollapsible = $( listItems[ i ].children[1].children[j] );
itemtextCollapsible = itemCollapsible.text();

if ( itemCollapsible.is( "li:jqmData(role=list-divider)" ) ) {
itemCollapsible.toggleClass( "ui-filter-hidequeue" , !childItems );

// New bucket!
childItems = false;
} else if ( listview.options.filterCallback( itemtextCollapsible, val, itemCollapsible ) ) {

//mark to be hidden
itemCollapsible.toggleClass( "ui-filter-hidequeue" , true );
}
}

} else {

// There's a shown item in the bucket
Expand All @@ -108,11 +132,36 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
.filter( ".ui-filter-hidequeue" )
.toggleClass( "ui-screen-hidden", true )
.toggleClass( "ui-filter-hidequeue", false );

for ( var i = listItems.length - 1; i >= 0; i-- ) {
if(listItems[i].className.indexOf("ui-collapsible") === 0) {
listItemsCollapsible = $(listItems[i].children[1].children);

// Show Collapsible items, not marked to be hidden
listItemsCollapsible
.filter( ":not(.ui-filter-hidequeue)" )
.toggleClass( "ui-screen-hidden", false );

// Hide Collapsible items, marked to be hidden
listItemsCollapsible
.filter( ".ui-filter-hidequeue" )
.toggleClass( "ui-screen-hidden", true )
.toggleClass( "ui-filter-hidequeue", false );

}
}

} else {

//filtervalue is empty => show all
listItems.toggleClass( "ui-screen-hidden", !!listview.options.filterReveal );

for ( var i = listItems.length - 1; i >= 0; i-- ) {
if(listItems[i].className.indexOf("ui-collapsible") === 0) {
listItemsCollapsible = $(listItems[i].children[1].children);
listItemsCollapsible.toggleClass( "ui-screen-hidden", !!listview.options.filterReveal );
}
}
}
listview._refreshCorners();
})
Expand Down