PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Replace q.allSettled()

Browse source 
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
This commit is contained in:
Richard van der Hoff 2017-07-13 00:41:18 +01:00
parent 4c5b5ca0ba
commit 1d2d086a58
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/settings/Notifications.js
View file

@ -431,7 +431,9 @@ module.exports = React.createClass({
'global', kind, LEGACY_RULES[rule.rule_id], portLegacyActions(rule.actions) 'global', kind, LEGACY_RULES[rule.rule_id], portLegacyActions(rule.actions)
).then( function() { ).then( function() {
return cli.deletePushRule('global', kind, rule.rule_id); return cli.deletePushRule('global', kind, rule.rule_id);
}) }).catch( (e) => {
console.warn(`Error when porting legacy rule: ${e}`);
});
}(kind, rule)); }(kind, rule));
} }
} }
@ -440,7 +442,7 @@ module.exports = React.createClass({
if (needsUpdate.length > 0) { if (needsUpdate.length > 0) {
// If some of the rules need to be ported then wait for the porting // If some of the rules need to be ported then wait for the porting
// to happen and then fetch the rules again. // to happen and then fetch the rules again.
return q.allSettled(needsUpdate).then( function() { return q.all(needsUpdate).then( function() {
return cli.getPushRules(); return cli.getPushRules();
}); });
} else { } else {