Pārlūkot izejas kodu

fix: check remove on manual reload

Gerald 8 gadi atpakaļ
vecāks
revīzija
ddfb93e40e
2 mainītis faili ar 9 papildinājumiem un 10 dzēšanām
  1. 3 6
      src/background/app.js
  2. 6 4
      src/options/app.js

+ 3 - 6
src/background/app.js

@@ -67,12 +67,9 @@ const commands = {
     return removeScript(id)
     return removeScript(id)
     .then(() => { sync.sync(); });
     .then(() => { sync.sync(); });
   },
   },
-  GetData() {
-    return checkRemove()
-    .then(changed => {
-      if (changed) sync.sync();
-      return getData();
-    })
+  GetData(clear) {
+    return (clear ? checkRemove() : Promise.resolve())
+    .then(getData)
     .then(data => {
     .then(data => {
       data.sync = sync.getStates();
       data.sync = sync.getStates();
       data.version = VM_VER;
       data.version = VM_VER;

+ 6 - 4
src/options/app.js

@@ -53,8 +53,8 @@ function initScript(script) {
   script._cache = { search, name, lowerName };
   script._cache = { search, name, lowerName };
 }
 }
 
 
-function loadData() {
-  sendMessage({ cmd: 'GetData' })
+function loadData(clear) {
+  sendMessage({ cmd: 'GetData', data: clear })
   .then(data => {
   .then(data => {
     [
     [
       'cache',
       'cache',
@@ -72,9 +72,11 @@ function loadData() {
 
 
 function initMain() {
 function initMain() {
   store.loading = true;
   store.loading = true;
-  loadData();
+  loadData(true);
   Object.assign(handlers, {
   Object.assign(handlers, {
-    ScriptsUpdated: loadData,
+    ScriptsUpdated() {
+      loadData();
+    },
     UpdateSync(data) {
     UpdateSync(data) {
       store.sync = data;
       store.sync = data;
     },
     },