Skip to content

Commit 7c8f01d

Browse files
authored
Merge pull request #2558 from TrimmingFool/v4.2
Fix quick search and label size option
2 parents f49d3cb + 6fd07f3 commit 7c8f01d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

js/webui.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ var theWebUI =
21842184
...labelPanelEl.querySelectorAll(':scope > :not(li[id^="clabel__"])'),
21852185
...customLabelElements
21862186
);
2187-
if (this.actLbls['plabel_cont'].some(lbl => !document.getElementById(lbl)))
2187+
if ((this.actLbls['plabel_cont'] ?? []).some(lbl => !document.getElementById(lbl)))
21882188
{
21892189
// Remove non-existent active labels (to potentially show 'All' label as selected)
21902190
this.actLbls['plabel_cont'] = this.actLbls['plabel_cont']
@@ -2347,7 +2347,7 @@ var theWebUI =
23472347

23482348
for(const k in this.labels)
23492349
{
2350-
if (!k.startsWith('clabel__')) {
2350+
if (k !== 'quick_search' && !k.startsWith('clabel__') && !k.startsWith('pview_custom_view_')) {
23512351
const lbl = k.startsWith('-_-_-') ? this.idToLbl(k) : k;
23522352
const stat = this.labelStat(k);
23532353
this.updateLabel(
@@ -3005,7 +3005,7 @@ var theWebUI =
30053005
{
30063006
const customViewRows = $('#pview_cont').children('.pview_custom_view');
30073007
const customViews = this.settings['webui.selected_labels.views'];
3008-
const showlabelsize = this.settings["webui.show_viewlabelsize"] || true;
3008+
const showlabelsize = this.settings["webui.show_viewlabelsize"];
30093009

30103010
this.updateAllFilterLabel('pview_cont', showlabelsize);
30113011

0 commit comments

Comments
 (0)