keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

This commit is contained in:
antelle 2019-09-16 23:19:54 +02:00
parent 39e683baf0
commit ec6a6e08ff
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/scripts/models/app-model.js
View File

@ -38,13 +38,13 @@ const AppModel = Backbone.Model.extend({
this.isBeta = RuntimeInfo.beta;
this.advancedSearch = null;
this.listenTo(Events, 'refresh', this.refresh);
this.listenTo(Events, 'set-filter', this.setFilter);
this.listenTo(Events, 'add-filter', this.addFilter);
this.listenTo(Events, 'set-sort', this.setSort);
this.listenTo(Events, 'empty-trash', this.emptyTrash);
this.listenTo(Events, 'select-entry', this.selectEntry);
this.listenTo(Events, 'unset-keyfile', this.unsetKeyFile);
this.listenTo(Events, 'refresh', this.refresh.bind(this));
this.listenTo(Events, 'set-filter', this.setFilter.bind(this));
this.listenTo(Events, 'add-filter', this.addFilter.bind(this));
this.listenTo(Events, 'set-sort', this.setSort.bind(this));
this.listenTo(Events, 'empty-trash', this.emptyTrash.bind(this));
this.listenTo(Events, 'select-entry', this.selectEntry.bind(this));
this.listenTo(Events, 'unset-keyfile', this.unsetKeyFile.bind(this));
this.appLogger = new Logger('app');

6
app/scripts/models/menu/menu-model.js
View File

@ -96,9 +96,9 @@ const MenuModel = Backbone.Model.extend({
]);
this.set('sections', this.menus.app);
this.listenTo(Events, 'set-locale', this._setLocale);
this.listenTo(Events, 'select-next-menu-item', this._selectNext);
this.listenTo(Events, 'select-previous-menu-item', this._selectPrevious);
this.listenTo(Events, 'set-locale', this._setLocale.bind(this));
this.listenTo(Events, 'select-next-menu-item', this._selectNext.bind(this));
this.listenTo(Events, 'select-previous-menu-item', this._selectPrevious.bind(this));
this._setLocale();
},

2
app/scripts/views/app-view.js
View File

@ -263,7 +263,7 @@ class AppView extends View {
this.hidePanelView();
this.hideOpenFile();
this.hideKeyChange();
this.views.settings = new SettingsView(this.mode);
this.views.settings = new SettingsView(this.model);
this.views.settings.render();
if (!selectedMenuItem) {
selectedMenuItem = this.model.menu.generalSection.get('items').first();

2
app/scripts/views/settings/settings-file-view.js
View File

@ -53,8 +53,6 @@ class SettingsFileView extends View {
'input .settings__input-kdf': 'changeKdfParameter'
};
appModel = null;
constructor(model, options) {
super(model, options);
this.listenTo(this.model, 'change:syncing change:syncError change:syncDate', () => {