Merge branch 'Fix-badge'

raykov · Aug 14, 2020 · 80b286b · 80b286b
2 parents 05ae10e + 0ae84e9
commit 80b286b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/js/providers/azure.js b/js/providers/azure.js
@@ -17,6 +17,7 @@ class Azure {
       return
     }
 
+    window.requestsData.setLoadingBadge();
     window.requestsData.setProviderLoading(self.name);
 
     if (self.configuration.token === "" || self.configuration.token === null || self.configuration.token === undefined) {

diff --git a/js/providers/github.js b/js/providers/github.js
@@ -18,6 +18,7 @@ class Github {
       return
     }
 
+    window.requestsData.setLoadingBadge();
     window.requestsData.setProviderLoading(self.name);
     window.requestsData.resetProviderData(self.name)
 

diff --git a/js/requests-data.js b/js/requests-data.js
@@ -80,14 +80,17 @@ class RequestsData {
     return Object.keys(this.loading).length > 0
   }
 
-  setProviderLoading(provider) {
+  setLoadingBadge() {
     this.badge.loading();
+  }
+
+  setProviderLoading(provider) {
     if (this.loading[provider] === undefined) this.loading[provider] = 0;
     this.loading[provider] ++;
   }
 
   setProviderLoaded(provider) {
-    this.loading[provider] --;
+    if (this.loading[provider] > 0) this.loading[provider] --;
     if (this.loading[provider] < 1) delete this.loading[provider];
   }
 

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,9 @@
 {
-  "name": "Github review requests list",
-  "version": "0.6.0",
-  "description": "Github review requests list",
+  "name": "Github and Azure review requests list",
+  "short_name": "Review requests list",
+  "author": "Andrii Raikov",
+  "version": "0.7.0",
+  "description": "Github and Azure review requests list",
   "manifest_version": 2,
   "background": {
     "persistent": false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ class Azure { @@
           return
         }
+        window.requestsData.setLoadingBadge();
         window.requestsData.setProviderLoading(self.name);
         if (self.configuration.token === "" || self.configuration.token === null || self.configuration.token === undefined) {
@@ Expand Down @@