From af726405e16295fe8451b4c91a36820ee89094ad Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 10 Oct 2020 14:25:43 +0300
Subject: [PATCH] also search in global styles

---
 _locales/en/messages.json |  4 ++++
 popup.html                |  7 +++++++
 popup/search-results.css  |  8 +++++++-
 popup/search-results.js   | 39 +++++++++++++++++++++++----------------
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a4f6eee9..e5f505f3 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1173,6 +1173,10 @@
     "message": "Case-sensitive",
     "description": "Tooltip for the 'Aa' icon that enables case-sensitive search in the editor shown on Ctrl-F"
   },
+  "searchGlobalStyles": {
+    "message": "Also search global styles",
+    "description": "Checkbox label in the popup's inline style search, shown when the text to search is entered"
+  },
   "searchNumberOfResults": {
     "message": "Number of matches",
     "description": "Tooltip for the number of found search results in the editor shown on Ctrl-F"
diff --git a/popup.html b/popup.html
index 980eb227..677edb81 100644
--- a/popup.html
+++ b/popup.html
@@ -265,6 +265,13 @@
         </select>
         <svg class="svg-icon select-arrow"><use xlink:href="#svg-icon-select-arrow"/></svg>
       </div>
+      <label>
+        <span class="checkbox-container">
+          <input id="search-globals" type="checkbox" checked>
+          <svg class="svg-icon checked"><use xlink:href="#svg-icon-checked"/></svg>
+        </span>
+        <span i18n-text="searchGlobalStyles"></span>
+      </label>
     </div>
     <div id="search-results-list"></div>
     <div class="search-results-nav" data-type="bottom"></div>
diff --git a/popup/search-results.css b/popup/search-results.css
index d4c8d4e9..a7eb69cf 100755
--- a/popup/search-results.css
+++ b/popup/search-results.css
@@ -254,13 +254,19 @@ body.search-results-shown {
 #search-params {
   display: flex;
   position: relative;
+  margin-top: -.5rem;
   margin-bottom: 1.25rem;
+  flex-wrap: wrap;
+}
+
+#search-params > * {
+  margin-top: .5rem;
 }
 
 #search-query {
   min-width: 3em;
   margin-right: .5em;
-  flex: auto;
+  flex: 1 1 0;
 }
 
 /* spinner: https://github.com/loadingio/css-spinner */
diff --git a/popup/search-results.js b/popup/search-results.js
index a29b6911..590a2337 100755
--- a/popup/search-results.js
+++ b/popup/search-results.js
@@ -34,6 +34,7 @@ window.addEventListener('showStyles:done', () => {
   /** @type IndexEntry[] */
   let index;
   let category = '';
+  let searchGlobals = $('#search-globals').checked;
   /** @type string[] */
   let query = [];
   /** @type 'n' | 'u' | 't' | 'w' | 'r'  */
@@ -45,9 +46,9 @@ window.addEventListener('showStyles:done', () => {
 
   calcCategory();
 
-  const $orNode = (sel, base) => sel instanceof Node ? sel : $(sel, base);
-  const show = (...args) => $orNode(...args).classList.remove('hidden');
-  const hide = (...args) => $orNode(...args).classList.add('hidden');
+  const $class = sel => (sel instanceof Node ? sel : $(sel)).classList;
+  const show = sel => $class(sel).remove('hidden');
+  const hide = sel => $class(sel).add('hidden');
 
   Object.assign($('#find-styles-link'), {
     href: URLS.usoArchive,
@@ -70,6 +71,10 @@ window.addEventListener('showStyles:done', () => {
   function init() {
     setTimeout(() => document.body.classList.add('search-results-shown'));
     hide('#find-styles-inline-group');
+    $('#search-globals').onchange = function () {
+      searchGlobals = this.checked;
+      ready = ready.then(start);
+    };
     $('#search-query').oninput = function () {
       query = [];
       const text = this.value.trim().toLocaleLowerCase();
@@ -156,8 +161,7 @@ window.addEventListener('showStyles:done', () => {
   function error(reason) {
     dom.error.textContent = reason;
     show(dom.error);
-    (results.length ? show : hide)(dom.container);
-    document.body.classList.toggle('search-results-shown', results.length > 0);
+    hide(dom.list);
     if (dom.error.getBoundingClientRect().bottom < 0) {
       dom.error.scrollIntoView({behavior: 'smooth', block: 'start'});
     }
@@ -165,6 +169,7 @@ window.addEventListener('showStyles:done', () => {
 
   async function start() {
     show(dom.container);
+    show(dom.list);
     hide(dom.error);
     results = [];
     try {
@@ -176,9 +181,9 @@ window.addEventListener('showStyles:done', () => {
         const allUsoIds = new Set(installedStyles.map(calcUsoId));
         results = results.filter(r => !allUsoIds.has(r.i));
       }
-      if (results.length || $('#search-query').value) {
-        render();
-      } else {
+      render();
+      (results.length ? show : hide)(dom.list);
+      if (!results.length && !$('#search-query').value) {
         error(t('searchResultNoneFound'));
       }
     } catch (reason) {
@@ -445,7 +450,8 @@ window.addEventListener('showStyles:done', () => {
 
   async function fetchIndex() {
     const timer = setTimeout(showSpinner, BUSY_DELAY, dom.list);
-    index = await download(INDEX_URL, {responseType: 'json'});
+    index = (await download(INDEX_URL, {responseType: 'json'}))
+      .filter(res => res.f === 'uso');
     clearTimeout(timer);
     $.remove(':scope > .lds-spinner', dom.list);
     return index;
@@ -459,18 +465,19 @@ window.addEventListener('showStyles:done', () => {
 
   function isResultMatching(res) {
     return (
-      res.f === 'uso' &&
-      res.c === category && (
-        category === STYLUS_CATEGORY
-         ? /\bStylus\b/.test(res.n)
-         : !query.length || query.every(isInHaystack, calcHaystack(res))
-       )
+      res.c === category ||
+      searchGlobals && res.c === 'global' && (query.length || calcHaystack(res)._nLC.includes(category))
+    ) && (
+      category === STYLUS_CATEGORY
+       ? /\bStylus\b/.test(res.n)
+       : !query.length || query.every(isInHaystack, calcHaystack(res))
     );
   }
 
   /** @this {IndexEntry} haystack */
   function isInHaystack(needle) {
-    return needle === this._year || this._nLC.includes(needle);
+    return this._year === needle && this.c !== 'global' ||
+           this._nLC.includes(needle);
   }
 
   /**