open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! filters

Browse Source
This commit is contained in:
tophf 2017-04-26 18:35:00 +03:00
parent 1e29504b9f
commit 5e2982c33b
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manage.js
View File

@ -371,11 +371,13 @@ Object.assign(handleEvent, {
} }
const enabledFilters = $$('#header [data-filter]').filter(el => getValue(el)); const enabledFilters = $$('#header [data-filter]').filter(el => getValue(el));
const buildFilter = hide => const buildFilter = hide =>
(hide ? '' : '.entry.hidden') +
[...enabledFilters.map(el => [...enabledFilters.map(el =>
el.dataset[hide ? 'filterHide' : 'filter'] el.dataset[hide ? 'filterHide' : 'filter']
.split(/,\s*/) .split(/,\s*/)
.map(s => '.entry' + (hide ? '' : '.hidden') + s)) .map(s => (hide ? '.entry:not(.hidden)' : '') + s)
].join(','); .join(','))
].join(hide ? ',' : '');
Object.assign(filtersSelector, { Object.assign(filtersSelector, {
hide: buildFilter(true), hide: buildFilter(true),
unhide: buildFilter(false), unhide: buildFilter(false),
@ -389,7 +391,7 @@ function handleUpdate(style, {reason, method} = {}) {
let entry; let entry;
let oldEntry = $('#style-' + style.id); let oldEntry = $('#style-' + style.id);
if (oldEntry && method == 'styleUpdated') { if (oldEntry && method == 'styleUpdated') {
handleToggledOrCodeEdited(); handleToggledOrCodeOnly();
} }
entry = entry || createStyleElement({style}); entry = entry || createStyleElement({style});
if (oldEntry) { if (oldEntry) {
@ -408,7 +410,7 @@ function handleUpdate(style, {reason, method} = {}) {
scrollElementIntoView(entry); scrollElementIntoView(entry);
} }
function handleToggledOrCodeEdited() { function handleToggledOrCodeOnly() {
const newStyleMeta = getStyleWithNoCode(style); const newStyleMeta = getStyleWithNoCode(style);
const diff = objectDiff(oldEntry.styleMeta, newStyleMeta); const diff = objectDiff(oldEntry.styleMeta, newStyleMeta);
if (diff.length == 0) { if (diff.length == 0) {
@ -755,11 +757,14 @@ function filterAndAppend({entry, container}) {
function reapplyFilter(container = installed) { function reapplyFilter(container = installed) {
// A: show // A: show
const toUnhide = filtersSelector.hide ? filterContainer({hide: false}) : container; let toUnhide = filtersSelector.hide ? filterContainer({hide: false}) : container;
// showStyles() is building the page and no filters are active // showStyles() is building the page and no filters are active
if (toUnhide instanceof DocumentFragment) { if (toUnhide instanceof DocumentFragment) {
installed.appendChild(toUnhide); installed.appendChild(toUnhide);
return; return;
} else if (toUnhide.length && $('#search').value.trim()) {
searchStyles({immediately: true, container: toUnhide});
toUnhide = filterContainer({hide: false});
} }
// filtering needed or a single-element job from handleUpdate() // filtering needed or a single-element job from handleUpdate()
const entries = installed.children; const entries = installed.children;
@ -790,12 +795,7 @@ function reapplyFilter(container = installed) {
for (const entry of toHide) { for (const entry of toHide) {
installed.appendChild(entry); installed.appendChild(entry);
} }
const firstHidden = $('.entry.hidden'); installed.insertBefore(container, $('.entry.hidden'));
if (container.forEach) {
container.forEach(el => installed.insertBefore(el, firstHidden));
} else {
installed.insertBefore(container, firstHidden);
}
return; return;
} }
// normal filtering of the page or a single-element job from handleUpdate() // normal filtering of the page or a single-element job from handleUpdate()
@ -812,7 +812,16 @@ function reapplyFilter(container = installed) {
function filterContainer({hide}) { function filterContainer({hide}) {
const selector = filtersSelector[hide ? 'hide' : 'unhide']; const selector = filtersSelector[hide ? 'hide' : 'unhide'];
if (container.filter) { if (container.filter) {
return container.filter(el => el.matches(selector)); if (hide) {
// already filtered in previous invocation
return container;
}
const toHide = [], toUnhide = [];
for (const el of container) {
(el.matches(selector) ? toUnhide : toHide).push(el);
}
container = toHide;
return toUnhide;
} else { } else {
return $$(selector, container); return $$(selector, container);
} }