fixed decorator to limit async calls

Author: JohnstonCode

CHANGELOG.md

@@ -1,3 +1,9 @@
+**v0.8.2**
+=============================================
+
+## Bug Fixes
+  - Fixed decorator to limit async calls.
+
 **v0.8.1**
 =============================================
 

package.json

@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "svn-scm",
   "description": "",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.16.0"

src/decorators.js

@@ -1,31 +1,14 @@
-module.exports.throttle = function(func, wait, context, s) {
-  var args, result;
-  var timeout = null;
-  var previous = 0;
-  if (!options) options = {};
-  var later = function() {
-    previous = options.leading === false ? 0 : Date.now();
-    timeout = null;
-    result = func.apply(context, args);
-    if (!timeout) args = null;
-  };
+module.exports.throttle = function(func, wait, context) {
+  var timer = null;
+
   return function() {
-    var now = Date.now();
-    if (!previous && options.leading === false) previous = now;
-    var remaining = wait - (now - previous);
-    args = arguments;
-    if (remaining <= 0 || remaining > wait) {
-      if (timeout) {
-        clearTimeout(timeout);
-        timeout = null;
-      }
-      previous = now;
-      result = func.apply(context, args);
-      if (!timeout) args = null;
-    } else if (!timeout && options.trailing !== false) {
-      timeout = setTimeout(later, remaining);
-    }
-    return result;
+    var args = arguments;
+
+    clearTimeout(timer);
+
+    timer = setTimeout(function() {
+      fn.apply(context, args);
+    }, wait);
   };
 };
 
@@ -39,8 +22,8 @@ module.exports.throttleAsync = function(fn, key, context = this) {
     }
 
     if (this[currentKey]) {
-      this[nextKey] = done(this[currentKey]).then(() => {
-        this[nextKey] = undefined;
+      done(this[currentKey]).then(() => {
+        this[nextKey] = false;
         return trigger.apply(context, args);
       });
 
@@ -49,8 +32,9 @@ module.exports.throttleAsync = function(fn, key, context = this) {
 
     this[currentKey] = fn.apply(context, args);
 
-    const clear = () => (this[currentKey] = undefined);
-    done(this[currentKey]).then(clear, clear);
+    this[currentKey].then(() => {
+      this[currentKey] = false;
+    });
 
     return this[currentKey];
   };

src/repository.js

@@ -28,8 +28,8 @@ function Repository(repository) {
   this.changes.hideWhenEmpty = true;
   this.notTracked.hideWhenEmpty = true;
 
-  this.addEventListeners();
   this.update();
+  this.addEventListeners();
 }
 
 Repository.prototype.addEventListeners = function() {
@@ -46,55 +46,57 @@ Repository.prototype.provideOriginalResource = uri => {
   return new Uri().with({ scheme: "svn", query: uri.path, path: uri.path });
 };
 
-Repository.prototype.update = async function() {
-  let changes = [];
-  let notTracked = [];
+Repository.prototype.update = function() {
+  return new Promise((resolve, reject) => {
+    let changes = [];
+    let notTracked = [];
 
-  this.changes.resourceStates = [];
-  this.notTracked.resourceStates = [];
+    this.changes.resourceStates = [];
+    this.notTracked.resourceStates = [];
 
-  this.repository
-    .getStatus()
-    .then(result => {
-      let changes = [];
-      let notTracked = [];
+    this.repository
+      .getStatus()
+      .then(result => {
+        let changes = [];
+        let notTracked = [];
 
-      result.forEach(item => {
-        switch (item["wc-status"].$.item) {
-          case "modified":
-          case "deleted":
-          case "conflicted":
-          case "replaced":
-          case "missing":
-          case "added":
-            changes.push(
-              new Resource(
-                this.repository.root,
-                item.$.path,
-                item["wc-status"].$.item
-              )
-            );
-            break;
-          case "unversioned":
-            notTracked.push(
-              new Resource(
-                this.repository.root,
-                item.$.path,
-                item["wc-status"].$.item
-              )
-            );
-            break;
-        }
-      });
+        result.forEach(item => {
+          switch (item["wc-status"].$.item) {
+            case "modified":
+            case "deleted":
+            case "conflicted":
+            case "replaced":
+            case "missing":
+            case "added":
+              changes.push(
+                new Resource(
+                  this.repository.root,
+                  item.$.path,
+                  item["wc-status"].$.item
+                )
+              );
+              break;
+            case "unversioned":
+              notTracked.push(
+                new Resource(
+                  this.repository.root,
+                  item.$.path,
+                  item["wc-status"].$.item
+                )
+              );
+              break;
+          }
+        });
 
-      this.changes.resourceStates = changes;
-      this.notTracked.resourceStates = notTracked;
+        this.changes.resourceStates = changes;
+        this.notTracked.resourceStates = notTracked;
 
-      // console.log(this.changes.resourceStates);
-    })
-    .catch(error => {
-      // console.log(error);
-    });
+        resolve();
+      })
+      .catch(error => {
+        reject();
+      });
+  });
 };
 
 module.exports = Repository;