forked from matrix/element-web
Merge pull request #2541 from vector-im/dbkr/blank_config_3
Better support no-config when loading from file
This commit is contained in:
commit
4dab36d3b2
|
@ -179,13 +179,16 @@ function getConfig() {
|
|||
if (err || response.status < 200 || response.status >= 300) {
|
||||
// Lack of a config isn't an error, we should
|
||||
// just use the defaults.
|
||||
// Also treat a blank config as no config because
|
||||
// we don't get 404s from file: URIs so this is the
|
||||
// only way we can not fail if the file doesn't exist
|
||||
// when loading from a file:// URI.
|
||||
if (( response && response.status == 404) || body == '') {
|
||||
// Also treat a blank config as no config, assuming
|
||||
// the status code is 0, because we don't get 404s
|
||||
// from file: URIs so this is the only way we can
|
||||
// not fail if the file doesn't exist when loading
|
||||
// from a file:// URI.
|
||||
if (response) {
|
||||
if (response.status == 404 || (response.status == 0 && body == '')) {
|
||||
deferred.resolve({});
|
||||
}
|
||||
}
|
||||
deferred.reject({err: err, response: response});
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue