From 361357e20635e246ed5d2bd715bf886f4ee32ec0 Mon Sep 17 00:00:00 2001 From: Felix Jorkowski Date: Fri, 25 Aug 2017 04:47:45 -0700 Subject: [PATCH] fix: validate, flatten promise (fix missing propagation of errors) (#314) --- src/Validator.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Validator.js b/src/Validator.js index ebcf3b96..907c0005 100644 --- a/src/Validator.js +++ b/src/Validator.js @@ -87,21 +87,21 @@ export default class Validator { related, })); - // wait all promises then resolve - return Promise.all(this.promises) - .then(action(() => { - instance.$validating = false; - instance.$clearing = false; - instance.$resetting = false; - })) - .catch(action((err) => { - instance.$validating = false; - instance.$clearing = false; - instance.$resetting = false; - throw err; - })) - .then(() => resolve(instance)); - }); + // wait all promises + resolve(Promise.all(this.promises)); + }) + .then(action(() => { + instance.$validating = false; + instance.$clearing = false; + instance.$resetting = false; + })) + .catch(action((err) => { + instance.$validating = false; + instance.$clearing = false; + instance.$resetting = false; + throw err; + })) + .then(() => instance); } @action