OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Signed-off-by: Aaron Raimist <aaron@raim.ist>
pull/7444/head
Aaron Raimist 2018-10-02 19:20:03 -05:00
parent b09aa2cff3
commit a5fb33de02
No known key found for this signature in database
GPG Key ID: 37419210002890EF
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/vector/getconfig.js
View File

@ -33,35 +33,33 @@ export async function getVectorConfig(relativeLocation) {
} }
function getConfig(configJsonFilename) { function getConfig(configJsonFilename) {
let deferred = Promise.defer(); return new Promise(function(resolve, reject) {
request(
request( { method: "GET", url: configJsonFilename },
{ method: "GET", url: configJsonFilename }, (err, response, body) => {
(err, response, body) => { if (err || response.status < 200 || response.status >= 300) {
if (err || response.status < 200 || response.status >= 300) { // Lack of a config isn't an error, we should
// Lack of a config isn't an error, we should // just use the defaults.
// just use the defaults. // Also treat a blank config as no config, assuming
// Also treat a blank config as no config, assuming // the status code is 0, because we don't get 404s
// the status code is 0, because we don't get 404s // from file: URIs so this is the only way we can
// from file: URIs so this is the only way we can // not fail if the file doesn't exist when loading
// not fail if the file doesn't exist when loading // from a file:// URI.
// from a file:// URI. if (response) {
if (response) { if (response.status == 404 || (response.status == 0 && body == '')) {
if (response.status == 404 || (response.status == 0 && body == '')) { resolve({});
deferred.resolve({}); }
} }
reject({err: err, response: response});
return;
} }
deferred.reject({err: err, response: response});
return; // We parse the JSON ourselves rather than use the JSON
// parameter, since this throws a parse error on empty
// which breaks if there's no config.json and we're
// loading from the filesystem (see above).
resolve(JSON.parse(body));
} }
);
// We parse the JSON ourselves rather than use the JSON })
// parameter, since this throws a parse error on empty
// which breaks if there's no config.json and we're
// loading from the filesystem (see above).
deferred.resolve(JSON.parse(body));
}
);
return deferred.promise;
} }