fix #376: init storages when config is read

This commit is contained in:
antelle 2016-09-20 23:30:19 +03:00
parent 0812f84334
commit 1e3e351dd8
4 changed files with 7 additions and 4 deletions

View File

@ -10,6 +10,7 @@ var AppModel = require('./models/app-model'),
Updater = require('./comp/updater'), Updater = require('./comp/updater'),
AuthReceiver = require('./comp/auth-receiver'), AuthReceiver = require('./comp/auth-receiver'),
ExportApi = require('./comp/export-api'), ExportApi = require('./comp/export-api'),
Storage = require('./storage'),
SettingsManager = require('./util/settings-manager'), SettingsManager = require('./util/settings-manager'),
Locale = require('./util/locale'); Locale = require('./util/locale');
@ -77,6 +78,7 @@ $(() => {
} }
function showView() { function showView() {
appModel.prepare();
new AppView({ model: appModel }).render(); new AppView({ model: appModel }).render();
Updater.init(); Updater.init();
SingleInstanceChecker.init(); SingleInstanceChecker.init();

View File

@ -43,8 +43,11 @@ var AppModel = Backbone.Model.extend({
this.listenTo(Backbone, 'select-entry', this.selectEntry); this.listenTo(Backbone, 'select-entry', this.selectEntry);
this.appLogger = new Logger('app'); this.appLogger = new Logger('app');
},
prepare: function() {
AutoType.init(this); AutoType.init(this);
_.forEach(Storage, prv => prv.init());
}, },
loadConfig: function(configLocation, callback) { loadConfig: function(configLocation, callback) {

View File

@ -11,6 +11,4 @@ var Storage = {
cache: Launcher ? require('./storage-file-cache') : require('./storage-cache') cache: Launcher ? require('./storage-file-cache') : require('./storage-cache')
}; };
_.forEach(Storage, prv => prv.init());
module.exports = Storage; module.exports = Storage;

View File

@ -40,8 +40,8 @@
}, },
"files": [{ "files": [{
"storage": "webdav", "storage": "webdav",
"name": "", "name": "My file",
"path": "", "path": "webdav-url",
"options": { "user": "", "password": "" } "options": { "user": "", "password": "" }
}] }]
} }