gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Promise.defer warnings in WebPlatform.js (#7409) 

Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2018-10-02 19:34:57 -05:00
parent 54c46df0dc
commit 401c85ad5b
No known key found for this signature in database
GPG Key ID: 37419210002890EF
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vector/platform/WebPlatform.js
View File

@ -68,11 +68,11 @@ export default class WebPlatform extends VectorBasePlatform {
// annoyingly, the latest spec says this returns a // annoyingly, the latest spec says this returns a
// promise, but this is only supported in Chrome 46 // promise, but this is only supported in Chrome 46
// and Firefox 47, so adapt the callback API. // and Firefox 47, so adapt the callback API.
const defer = Promise.defer(); return new Promise(function(resolve, reject) {
global.Notification.requestPermission((result) => { global.Notification.requestPermission((result) => {
defer.resolve(result); resolve(result);
}); });
return defer.promise; })
} }
displayNotification(title: string, msg: string, avatarUrl: string, room: Object) { displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
@ -103,13 +103,13 @@ export default class WebPlatform extends VectorBasePlatform {
} }
_getVersion(): Promise<string> { _getVersion(): Promise<string> {
const deferred = Promise.defer();
// We add a cachebuster to the request to make sure that we know about // We add a cachebuster to the request to make sure that we know about
// the most recent version on the origin server. That might not // the most recent version on the origin server. That might not
// actually be the version we'd get on a reload (particularly in the // actually be the version we'd get on a reload (particularly in the
// presence of intermediate caching proxies), but still: we're trying // presence of intermediate caching proxies), but still: we're trying
// to tell the user that there is a new version. // to tell the user that there is a new version.
return new Promise(function(resolve, reject) {
request( request(
{ {
method: "GET", method: "GET",
@ -119,15 +119,15 @@ export default class WebPlatform extends VectorBasePlatform {
(err, response, body) => { (err, response, body) => {
if (err || response.status < 200 || response.status >= 300) { if (err || response.status < 200 || response.status >= 300) {
if (err === null) err = { status: response.status }; if (err === null) err = { status: response.status };
deferred.reject(err); reject(err);
return; return;
} }
const ver = body.trim(); const ver = body.trim();
deferred.resolve(ver); resolve(ver);
}, },
); );
return deferred.promise; })
} }
getAppVersion(): Promise<string> { getAppVersion(): Promise<string> {