@@ -107,6 +108,26 @@ export default {
}
return out;
+ },
+
+ visibleItems() {
+ if ( ! this.item || ! this.item.items )
+ return [];
+
+ if ( ! this.context.matches_only )
+ return this.item.items;
+
+ return this.item.items.filter(item => this.shouldShow(item));
+ },
+
+ visibleContents() {
+ if ( ! this.item || ! this.item.contents )
+ return [];
+
+ if ( ! this.context.matches_only )
+ return this.item.contents;
+
+ return this.item.contents.filter(item => this.shouldShow(item));
}
},
@@ -118,6 +139,31 @@ export default {
return item.no_filter || item.search_terms.includes(this.filter);
},
+ countMatches(item, seen) {
+ if ( ! this.filter || ! this.filter.length || ! item )
+ return 0;
+
+ if ( seen && seen.has(item) )
+ return 0;
+
+ if ( ! seen )
+ seen = new Set;
+
+ seen.add(item);
+
+ let count = 0;
+
+ for(const key of ['tabs', 'contents', 'items'])
+ if ( item[key] )
+ for(const thing of item[key])
+ count += this.countMatches(thing, seen);
+
+ if ( item.setting && item.search_terms && item.search_terms.includes(this.filter) )
+ count++;
+
+ return count;
+ },
+
markSeen(item) {
this.$emit('mark-seen', item);
},
diff --git a/src/modules/main_menu/components/menu-tree.vue b/src/modules/main_menu/components/menu-tree.vue
index 0e80719a..2bef5f5d 100644
--- a/src/modules/main_menu/components/menu-tree.vue
+++ b/src/modules/main_menu/components/menu-tree.vue
@@ -35,7 +35,10 @@
{{ t(item.i18n_key, item.title) }}
-
+
+
@@ -117,6 +120,31 @@ export default {
return false;
},
+ countMatches(item, seen) {
+ if ( ! this.filter || ! this.filter.length || ! item )
+ return 0;
+
+ if ( seen && seen.has(item) )
+ return 0;
+
+ if ( ! seen )
+ seen = new Set;
+
+ seen.add(item);
+
+ let count = 0;
+
+ for(const key of ['tabs', 'contents', 'items'])
+ if ( item[key] )
+ for(const thing of item[key])
+ count += this.countMatches(thing, seen);
+
+ if ( item.setting && item.search_terms && item.search_terms.includes(this.filter) )
+ count++;
+
+ return count;
+ },
+
containsCurrent(item) {
let i = this.currentItem;
while ( i ) {
diff --git a/src/modules/main_menu/index.js b/src/modules/main_menu/index.js
index 51bbe64d..b4443d33 100644
--- a/src/modules/main_menu/index.js
+++ b/src/modules/main_menu/index.js
@@ -203,6 +203,15 @@ export default class MainMenu extends Module {
force_seen: true
});
+ this.settings.add('ffz.search.matches-only', {
+ default: true,
+ ui: {
+ path: 'Appearance > Control Center >> Search',
+ title: 'Hide items that do not match completely when searching.',
+ component: 'setting-check-box'
+ }
+ });
+
this.on('settings:added-definition', (key, definition) => {
this._addDefinitionToTree(key, definition);
this.scheduleUpdate();
@@ -834,6 +843,7 @@ export default class MainMenu extends Module {
can_proxy: context._context.can_proxy,
proxied: context._context.proxied,
has_update: this.has_update,
+ matches_only: settings.get('ffz.search.matches-only'),
mod_icons: context.get('context.chat.showModIcons'),
setProxied: val => {
@@ -946,9 +956,14 @@ export default class MainMenu extends Module {
}
},
+ _update_settings() {
+ _c.matches_only = settings.get('ffz.search.matches-only');
+ },
+
_add_user() {
this._users++;
if ( this._users === 1 ) {
+ settings.on(':changed:ffz.search.matches-only', this._update_settings, this);
settings.on(':profile-toggled', this._profile_toggled, this);
settings.on(':profile-created', this._profile_created, this);
settings.on(':profile-changed', this._profile_changed, this);
@@ -963,6 +978,7 @@ export default class MainMenu extends Module {
_remove_user() {
this._users--;
if ( this._users === 0 ) {
+ settings.off(':changed:ffz.search.matches-only', this._update_settings, this);
settings.off(':profile-toggled', this._profile_toggled, this);
settings.off(':profile-created', this._profile_created, this);
settings.off(':profile-changed', this._profile_changed, this);
diff --git a/src/modules/tooltips.js b/src/modules/tooltips.js
index aa9d9cef..fc409c0a 100644
--- a/src/modules/tooltips.js
+++ b/src/modules/tooltips.js
@@ -9,6 +9,7 @@ import {has, maybe_call, once} from 'utilities/object';
import Tooltip from 'utilities/tooltip';
import Module from 'utilities/module';
+import awaitMD, {getMD} from 'utilities/markdown';
export default class TooltipProvider extends Module {
constructor(...args) {
@@ -60,9 +61,9 @@ export default class TooltipProvider extends Module {
this.types.markdown = (target, tip) => {
tip.add_class = 'ffz-tooltip--markdown';
- const md = this.getMarkdown();
+ const md = getMD();
if ( ! md )
- return this.loadMarkdown().then(md => md.render(target.dataset.title));
+ return awaitMD().then(md => md.render(target.dataset.title));
return md.render(target.dataset.title);
};
@@ -71,46 +72,8 @@ export default class TooltipProvider extends Module {
this.types.html = target => target.dataset.title;
this.onFSChange = this.onFSChange.bind(this);
-
- this.loadMarkdown = once(this.loadMarkdown);
-
}
- getMarkdown(callback) {
- if ( this._md )
- return this._md;
-
- if ( callback )
- this.loadMarkdown().then(md => callback(md));
- }
-
- async loadMarkdown() { // eslint-disable-line class-methods-use-this
- if ( this._md )
- return this._md;
-
- const [MD, MILA] = await Promise.all([
- import(/* webpackChunkName: 'markdown' */ 'markdown-it'),
- import(/* webpackChunkName: 'markdown' */ 'markdown-it-link-attributes')
- ]);
-
- const md = this._md = new MD.default({
- html: false,
- linkify: true
- });
-
- md.use(MILA.default, {
- attrs: {
- class: 'ffz-tooltip',
- target: '_blank',
- rel: 'noopener',
- 'data-tooltip-type': 'link'
- }
- });
-
- return md;
- }
-
-
onEnable() {
const container = this.getRoot();
diff --git a/src/settings/components/category.vue b/src/settings/components/category.vue
index 085b2bc4..df73ccde 100644
--- a/src/settings/components/category.vue
+++ b/src/settings/components/category.vue
@@ -26,26 +26,7 @@
class="tw-flex-grow-1"
@selected="onSelected"
>
-
diff --git a/src/settings/components/channel.vue b/src/settings/components/channel.vue
index 67d9c298..ba57ff74 100644
--- a/src/settings/components/channel.vue
+++ b/src/settings/components/channel.vue
@@ -28,26 +28,7 @@
class="tw-flex-grow-1"
@selected="onSelected"
>
-
-
+
-
-
-
-
-
- ![]()
-
-
-
-
- - {{ slot.item.displayName }} -
-
-
+
-
-
-
-
-
- ![]()
-
-
-
-
- - {{ slot.item.displayName }} -
-