Commit 370c4c84 authored by JC Brand's avatar JC Brand

Use async/await instead of explicit promises

parent 4c83a233
...@@ -64494,27 +64494,20 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis ...@@ -64494,27 +64494,20 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis
}); });
}, },
hasFeature(feature) { async hasFeature(feature) {
/* Returns a Promise which resolves with a map indicating /* Returns a Promise which resolves with a map indicating
* whether a given feature is supported. * whether a given feature is supported.
* *
* Parameters: * Parameters:
* (String) feature - The feature that might be supported. * (String) feature - The feature that might be supported.
*/ */
const entity = this; await this.waitUntilFeaturesDiscovered;
return new Promise((resolve, reject) => {
function fulfillPromise() { if (this.features.findWhere({
if (entity.features.findWhere({
'var': feature 'var': feature
})) { })) {
resolve(entity); return this;
} else {
resolve();
}
} }
entity.waitUntilFeaturesDiscovered.then(fulfillPromise).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
});
}, },
onFeatureAdded(feature) { onFeatureAdded(feature) {
...@@ -79,26 +79,17 @@ converse.plugins.add('converse-disco', { ...@@ -79,26 +79,17 @@ converse.plugins.add('converse-disco', {
}); });
}, },
hasFeature (feature) { async hasFeature (feature) {
/* Returns a Promise which resolves with a map indicating /* Returns a Promise which resolves with a map indicating
* whether a given feature is supported. * whether a given feature is supported.
* *
* Parameters: * Parameters:
* (String) feature - The feature that might be supported. * (String) feature - The feature that might be supported.
*/ */
const entity = this; await this.waitUntilFeaturesDiscovered
return new Promise((resolve, reject) => { if (this.features.findWhere({'var': feature})) {
function fulfillPromise () { return this;
if (entity.features.findWhere({'var': feature})) {
resolve(entity);
} else {
resolve();
}
} }
entity.waitUntilFeaturesDiscovered
.then(fulfillPromise)
.catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
});
}, },
onFeatureAdded (feature) { onFeatureAdded (feature) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment