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

display open keyfile name

This commit is contained in:
antelle 2016-04-07 00:13:44 +03:00
parent 4520730452
commit e7f11cf0b1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,7 @@ var AppModel = Backbone.Model.extend({
openFileWithData: function(params, callback, fileInfo, data, updateCacheOnSuccess) {
var logger = new Logger('open', params.name);
if (!params.keyFileName && fileInfo && fileInfo.get('keyFileName') && this.settings.get('rememberKeyFiles')) {
if (!params.keyFileData && fileInfo && fileInfo.get('keyFileName') && this.settings.get('rememberKeyFiles')) {
params.keyFileName = fileInfo.get('keyFileName');
params.keyFileData = FileModel.createKeyFileWithHash(fileInfo.get('keyFileHash'));
}

8
app/scripts/views/open-view.js
View File

@ -220,8 +220,8 @@ var OpenView = Backbone.View.extend({
},
displayOpenKeyFile: function() {
this.$el.find('.open__settings-key-file-name').text(this.params.keyFileName);
this.$el.addClass('open--key-file');
this.$el.toggleClass('open--key-file', !!this.params.keyFileName);
this.$el.find('.open__settings-key-file-name').text(this.params.keyFileName || Locale.openKeyFile);
this.inputEl.focus();
},
@ -260,7 +260,7 @@ var OpenView = Backbone.View.extend({
this.params.keyFileData = null;
this.params.keyFileName = '';
this.$el.removeClass('open--key-file');
this.$el.find('.open__settings-key-file-name').text('key file');
this.$el.find('.open__settings-key-file-name').text(Locale.openKeyFile);
} else {
this.openAny('keyFileData');
}
@ -401,7 +401,9 @@ var OpenView = Backbone.View.extend({
this.params.name = fileInfo.get('name');
this.params.fileData = null;
this.params.rev = null;
this.params.keyFileName = fileInfo.get('keyFileName');
this.displayOpenFile();
this.displayOpenKeyFile();
},
showOpenLocalFile: function(path) {