mirror of https://github.com/keeweb/keeweb.git
fix #428: cacheConfigSettings config option
This commit is contained in:
parent
eee4ff2130
commit
60b0d68516
|
@ -27,7 +27,7 @@ $(() => {
|
|||
if (configParam) {
|
||||
appModel.loadConfig(configParam, err => {
|
||||
SettingsManager.setBySettings(appModel.settings);
|
||||
if (err) {
|
||||
if (err && !appModel.settings.get('cacheConfigSettings')) {
|
||||
showSettingsLoadError();
|
||||
} else {
|
||||
showApp();
|
||||
|
|
|
@ -68,6 +68,7 @@ const AppModel = Backbone.Model.extend({
|
|||
response = JSON.parse(response);
|
||||
} catch (e) {
|
||||
this.appLogger.error('Error parsing response', e, response);
|
||||
return callback(true);
|
||||
}
|
||||
}
|
||||
if (!response.settings) {
|
||||
|
|
|
@ -38,7 +38,8 @@ const AppSettingsModel = Backbone.Model.extend({
|
|||
dropbox: true,
|
||||
webdav: true,
|
||||
gdrive: true,
|
||||
onedrive: true
|
||||
onedrive: true,
|
||||
cacheConfigSettings: false
|
||||
},
|
||||
|
||||
initialize: function() {
|
||||
|
|
|
@ -2,6 +2,7 @@ Release notes
|
|||
-------------
|
||||
##### v1.5.0 (TBD)
|
||||
`+` file path hint in recent files list
|
||||
`+` cacheConfigSettings config option
|
||||
|
||||
##### v1.4.0 (2017-02-04)
|
||||
KDBX4 format support and minor improvements
|
||||
|
|
|
@ -38,7 +38,9 @@
|
|||
"gdriveClientId": null,
|
||||
|
||||
"onedrive": true,
|
||||
"onedriveClientId": null
|
||||
"onedriveClientId": null,
|
||||
|
||||
"cacheConfigSettings": false
|
||||
},
|
||||
"files": [{
|
||||
"storage": "webdav",
|
||||
|
|
Loading…
Reference in New Issue