Merge pull request #17 from alk-sdavid/security

security: upgrade dependencies
alkemics · Jul 17, 2019 · d603780 · d603780
2 parents 18be51a + b5e3765
commit d603780
Show file tree

Hide file tree

Showing 8 changed files with 6,696 additions and 1,554 deletions.
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -0,0 +1,2 @@
+singleQuote: true
+trailingComma: es5
diff --git a/CancelablePromise.js b/CancelablePromise.js
@@ -38,25 +38,28 @@ export default class CancelablePromise {
 
   then(success, error) {
     const p = new CancelablePromise((resolve, reject) => {
-      this._promise.then((r) => {
-        if (this._canceled) {
-          p.cancel();
+      this._promise.then(
+        r => {
+          if (this._canceled) {
+            p.cancel();
+          }
+          if (success && !this._canceled) {
+            handleCallback(resolve, reject, success, r);
+          } else {
+            resolve(r);
+          }
+        },
+        r => {
+          if (this._canceled) {
+            p.cancel();
+          }
+          if (error && !this._canceled) {
+            handleCallback(resolve, reject, error, r);
+          } else {
+            reject(r);
+          }
         }
-        if (success && !this._canceled) {
-          handleCallback(resolve, reject, success, r);
-        } else {
-          resolve(r);
-        }
-      }, (r) => {
-        if (this._canceled) {
-          p.cancel();
-        }
-        if (error && !this._canceled) {
-          handleCallback(resolve, reject, error, r);
-        } else {
-          reject(r);
-        }
-      });
+      );
     });
     return p;
   }