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

fix #95: unlock by opening settings

This commit is contained in:
Antelle 2016-02-23 08:20:01 +03:00
parent 3272cd2553
commit d5fedb8d97
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ var AppModel = Backbone.Model.extend({
this.menu.filesSection.removeAllItems(); this.menu.filesSection.removeAllItems();
this.tags.splice(0, this.tags.length); this.tags.splice(0, this.tags.length);
this.filter = {}; this.filter = {};
this.refresh();
}, },
closeFile: function(file) { closeFile: function(file) {

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

@ -455,7 +455,11 @@ var AppView = Backbone.View.extend({
} }
if (this.views.settings) { if (this.views.settings) {
if (this.views.settings.page === page || !menuItem) { if (this.views.settings.page === page || !menuItem) {
this.showEntries(); if (this.model.files.hasOpenFiles()) {
this.showEntries();
} else {
this.showLastOpenFile();
}
} else { } else {
if (menuItem) { if (menuItem) {
this.model.menu.select({item: menuItem}); this.model.menu.select({item: menuItem});

5
release-notes.md
View File

@ -1,5 +1,10 @@
Release notes Release notes
------------- -------------
##### v1.0.3 (TBD)
Hotfix
`-` #92: save files on exit
`-` #95: unlock by opening settings
##### v1.0.2 (2016-02-17) ##### v1.0.2 (2016-02-17)
Hotfix Hotfix
`-` #80: dragdrop bug `-` #80: dragdrop bug