From e67b7f4f36856ba26e08e37f91d9631aa77ec469 Mon Sep 17 00:00:00 2001
From: eight <eight04@gmail.com>
Date: Fri, 12 Oct 2018 17:27:19 +0800
Subject: [PATCH] Add: implement sloppy regexp indicator

---
 popup/popup.css |  6 ++++
 popup/popup.js  | 83 ++++++++++++++++---------------------------------
 2 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/popup/popup.css b/popup/popup.css
index 0fab0e7e..22e8f73d 100644
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -319,6 +319,10 @@ html[style*="border"] .entry:nth-child(11):before {
   box-sizing: border-box;
   cursor: pointer;
   font-size: 90%;
+  display: none;
+}
+.regexp-partial .regexp-problem-indicator {
+  display: block;
 }
 
 .regexp-partial .actions,
@@ -329,6 +333,8 @@ html[style*="border"] .entry:nth-child(11):before {
 #regexp-explanation {
   position: fixed;
   background-color: white;
+  top: 50%;
+  transform: translateY(-50%);
   left: 0;
   right: 0;
   padding: .5rem;
diff --git a/popup/popup.js b/popup/popup.js
index d1df89dd..21ab5bc5 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -17,18 +17,21 @@ const ENTRY_ID_PREFIX = '#' + ENTRY_ID_PREFIX_RAW;
 
 toggleSideBorders();
 
-getActiveTab().then(tab =>
-  FIREFOX && tab.url === 'about:blank' && tab.status === 'loading'
-  ? getTabRealURLFirefox(tab)
-  : getTabRealURL(tab)
-).then(url => Promise.all([
-  (tabURL = URLS.supported(url) ? url : '') &&
-  API.getStylesInfoByUrl(tabURL),
-  onDOMready().then(initPopup),
-])).then(([results]) => {
-  console.log(results);
-  showStyles(results.map(r => Object.assign(r.data, r)));
-}).catch(console.error);
+getActiveTab()
+  .then(tab =>
+    FIREFOX && tab.url === 'about:blank' && tab.status === 'loading'
+    ? getTabRealURLFirefox(tab)
+    : getTabRealURL(tab)
+  )
+  .then(url => Promise.all([
+    (tabURL = URLS.supported(url) ? url : '') &&
+    API.getStylesInfoByUrl(tabURL),
+    onDOMready().then(initPopup),
+  ]))
+  .then(([results]) => {
+    showStyles(results.map(r => Object.assign(r.data, r)));
+  })
+  .catch(console.error);
 
 msg.onExtension(onRuntimeMessage);
 
@@ -230,27 +233,12 @@ function showStyles(styles) {
   const container = document.createDocumentFragment();
   styles.forEach(style => createStyleElement({style, container}));
   installed.appendChild(container);
-  setTimeout(detectSloppyRegexps, 100, styles);
-
-  // FIXME: detect sloppy regexp?
-  // API.getStyles({
-    // matchUrl: tabURL,
-    // strictRegexp: false,
-    // omitCode: true,
-  // }).then(unscreenedStyles => {
-    // for (const style of unscreenedStyles) {
-      // if (!styles.find(({id}) => id === style.id)) {
-        // createStyleElement({style, check: true});
-      // }
-    // }
   window.dispatchEvent(new Event('showStyles:done'));
-  // });
 }
 
 
 function createStyleElement({
   style,
-  check = false,
   container = installed,
 }) {
   let entry = $(ENTRY_ID_PREFIX + style.id);
@@ -294,6 +282,11 @@ function createStyleElement({
     $('.disable', entry).onclick = handleEvent.toggle;
     $('.delete', entry).onclick = handleEvent.delete;
     $('.configure', entry).onclick = handleEvent.configure;
+
+    const indicator = template.regexpProblemIndicator.cloneNode(true);
+    indicator.appendChild(document.createTextNode('!'));
+    indicator.onclick = handleEvent.indicator;
+    $('.main-controls', entry).appendChild(indicator);
   }
 
   style = Object.assign(entry.styleMeta, style);
@@ -314,9 +307,10 @@ function createStyleElement({
   const styleName = $('.style-name', entry);
   styleName.lastChild.textContent = style.name;
   setTimeout(() => {
-    if (styleName.scrollWidth > styleName.clientWidth + 1) {
-      styleName.title = styleName.textContent;
-    }
+    styleName.title = entry.styleMeta.sloppy ?
+      t('styleNotAppliedRegexpProblemTooltip') :
+        styleName.scrollWidth > styleName.clientWidth + 1 ?
+          styleName.textContent : '';
   });
 
   const config = $('.configure', entry);
@@ -330,7 +324,8 @@ function createStyleElement({
     style.usercssData && Object.keys(style.usercssData.vars || {}).length ?
       '' : 'none';
 
-  if (check) detectSloppyRegexps([style]);
+  entry.classList.toggle('not-applied', style.excluded || style.sloppy);
+  entry.classList.toggle('regexp-partial', style.sloppy);
 
   if (entry.parentNode !== container) {
     container.appendChild(entry);
@@ -532,32 +527,6 @@ function handleDelete(id) {
   }
 }
 
-
-function detectSloppyRegexps(styles) {
-  API.detectSloppyRegexps({
-    matchUrl: tabURL,
-    ids: styles.map(({id}) => id),
-  }).then(results => {
-    for (const {id, applied, skipped, hasInvalidRegexps} of results) {
-      const entry = $(ENTRY_ID_PREFIX + id);
-      if (!entry) continue;
-      if (!applied) {
-        entry.classList.add('not-applied');
-        $('.style-name', entry).title = t('styleNotAppliedRegexpProblemTooltip');
-      }
-      if (skipped || hasInvalidRegexps) {
-        entry.classList.toggle('regexp-partial', Boolean(skipped));
-        entry.classList.toggle('regexp-invalid', Boolean(hasInvalidRegexps));
-        const indicator = template.regexpProblemIndicator.cloneNode(true);
-        indicator.appendChild(document.createTextNode(entry.skipped || '!'));
-        indicator.onclick = handleEvent.indicator;
-        $('.main-controls', entry).appendChild(indicator);
-      }
-    }
-  });
-}
-
-
 function getTabRealURLFirefox(tab) {
   // wait for FF tab-on-demand to get a real URL (initially about:blank), 5 sec max
   return new Promise(resolve => {