Explorar el Código

feat: use normal color for a running disabled script

tophf hace 4 años
padre
commit
b402395693
Se han modificado 4 ficheros con 13 adiciones y 12 borrados
  1. 1 1
      src/injected/content/index.js
  2. 10 10
      src/popup/index.js
  3. 1 1
      src/popup/style.css
  4. 1 0
      src/popup/views/app.vue

+ 1 - 1
src/injected/content/index.js

@@ -122,7 +122,7 @@ async function sendSetPopup(isDelayed) {
       pendingSetPopup = null;
     }
     sendCmd('SetPopup',
-      assign({ menus }, objectPick(bridge, ['ids', 'failedIds', 'injectInto'])));
+      assign({ menus }, objectPick(bridge, ['ids', 'failedIds', 'runningIds', 'injectInto'])));
   }
 }
 

+ 10 - 10
src/popup/index.js

@@ -38,18 +38,18 @@ Object.assign(handlers, {
       const scope = store[isTop ? 'scripts' : 'frameScripts'];
       const metas = data.scripts?.filter(({ props: { id } }) => ids.includes(id))
         || (Object.assign(data, await sendCmdDirectly('GetData', ids))).scripts;
-      metas.forEach(script => loadScriptIcon(script, data.cache));
-      scope.push(...metas);
-      data.failedIds.forEach(id => {
-        scope.forEach((script) => {
-          if (script.props.id === id) {
-            script.failed = true;
-            if (!store.injectionFailure) {
-              store.injectionFailure = { fixable: data.injectInto === INJECT_PAGE };
-            }
+      metas.forEach(script => {
+        loadScriptIcon(script, data.cache);
+        const { id } = script.props;
+        script.runs = data.runningIds.includes(id);
+        if (data.failedIds.includes(id)) {
+          script.failed = true;
+          if (!store.injectionFailure) {
+            store.injectionFailure = { fixable: data.injectInto === INJECT_PAGE };
           }
-        });
+        }
       });
+      scope.push(...metas);
     }
   },
 });

+ 1 - 1
src/popup/style.css

@@ -75,7 +75,7 @@ footer {
     background: cornflowerblue;
     color: var(--bg);
   }
-  .disabled > & {
+  .disabled:not(.runs) > & {
     color: var(--fill-8);
     &:focus {
       color: var(--fill-4);

+ 1 - 0
src/popup/views/app.vue

@@ -83,6 +83,7 @@
             disabled: !item.data.config.enabled,
             failed: item.data.failed,
             removed: item.data.config.removed,
+            runs: item.data.runs,
             'extras-shown': activeExtras === item,
             'excludes-shown': item.excludesValue,
           }"