Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix - Filters causing token folders to be uncollapseable if closed early. #1557

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Fix - Filters causing token folders to be uncollapseable if closed early. #1557

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
7 changes: 4 additions & 3 deletions TokensPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2618,7 +2618,7 @@ function display_monster_filter_modal() {
}
});
$(`<label class="input-checkbox input-checkbox-label qa-input-checkbox_label qa-monster-filters_accessible-content" title="Only show content I have access to">
<input class="input-checkbox__input qa-input-checkbox_input" tabindex="0" type="checkbox" ${($.parseJSON(localStorage.getItem(`${gameId}-ownedMonsterFilter`)) == true) ? 'checked="checked"' : ''}>
<input class="input-checkbox__input qa-input-checkbox_input" tabindex="0" type="checkbox" ${(localStorage.getItem(`${gameId}-ownedMonsterFilter`) != 'undefined' && $.parseJSON(localStorage.getItem(`${gameId}-ownedMonsterFilter`)) == true) ? 'checked="checked"' : ''}>
<div class="input-checkbox__focus-indicator"></div>
<svg class="input-checkbox__icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" overflow="visible" focusable="false">
<path class="svg-border" d="M5.63636382,2.00000055 C3.62805456,2.00000064 2,3.62805509 2,5.63636419 C2,5.63636419 2,9.87878843 2,18.3636369 C1.9999997,20.3719455 3.62805456,22 5.63636367,22 L18.3636365,22 C20.3719454,22.0000001 22,20.3719455 22,18.3636364 L22,5.63636364 C22,3.62805455 20.3719454,2 18.3636363,2 L5.63636382,2.00000055 Z M19,17.25 C19,18.2164987 18.2164979,19 17.25,19 L6.75000007,19 C5.78350125,19 5,18.2164979 5,17.25 C5,17.25 5,17.25 5,17.25 L5,6.74999977 L5,6.75000003 C4.99999985,5.78350126 5.78350125,5 6.74999999,5 L17.2499999,5 C18.2164986,4.99999996 18.9999998,5.78350126 18.9999998,6.75000003 L19,17.25 Z"></path>
Expand Down Expand Up @@ -2653,7 +2653,8 @@ function close_monster_filter_iframe() {

if(localStorage.getItem('DDBEB-monster-filters') != null) {
// the user has the "remember filters" option checked... let's grab our data and move on
localStorage.setItem(`${gameId}-ownedMonsterFilter`, ownedFilter);
if(ownedFilter != undefined)
localStorage.setItem(`${gameId}-ownedMonsterFilter`, ownedFilter);
read_local_monster_search_filters();
sidebarMonsterFilter.remove();
tokensPanel.remove_sidebar_loading_indicator(); // if the user double clicks, we might remove iframe before dismissing the loading indicator
Expand Down Expand Up @@ -2681,7 +2682,7 @@ function close_monster_filter_iframe() {
function read_local_monster_search_filters() {
if(localStorage.getItem('DDBEB-monster-filters') != null){
monster_search_filters = $.parseJSON(localStorage.getItem('DDBEB-monster-filters'))
if($.parseJSON(localStorage.getItem(`${gameId}-ownedMonsterFilter`)) != null)
if(localStorage.getItem(`${gameId}-ownedMonsterFilter`) != 'undefined' && $.parseJSON(localStorage.getItem(`${gameId}-ownedMonsterFilter`)) != null)
window.ownedMonstersOnly = $.parseJSON(localStorage.getItem(`${gameId}-ownedMonsterFilter`));
} else {
monster_search_filters = {};
Expand Down