mirror of
https://github.com/keeweb/keeweb.git
synced 2024-06-26 07:39:04 +02:00
Merge branch 'release-1.1'
This commit is contained in:
commit
8dbc7b0e61
|
@ -96,7 +96,7 @@ if (window.process && window.process.versions && window.process.versions.electro
|
|||
this.remReq('app').minimizeApp();
|
||||
},
|
||||
canMinimize: function() {
|
||||
return process.platform === 'win32';
|
||||
return process.platform !== 'darwin';
|
||||
},
|
||||
updaterEnabled: function() {
|
||||
return this.req('remote').process.argv.indexOf('--disable-updater') === -1;
|
||||
|
|
|
@ -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'));
|
||||
}
|
||||
|
@ -516,7 +516,7 @@ var AppModel = Backbone.Model.extend({
|
|||
var storage = options.storage || file.get('storage');
|
||||
var path = options.path || file.get('path');
|
||||
var opts = options.opts || file.get('opts');
|
||||
if (storage && Storage[storage].getPathForName && !path) {
|
||||
if (storage && Storage[storage].getPathForName && (!path || storage !== file.get('storage'))) {
|
||||
path = Storage[storage].getPathForName(file.get('name'));
|
||||
}
|
||||
logger.info('Sync started', storage, path, options);
|
||||
|
|
|
@ -243,7 +243,9 @@ var AppView = Backbone.View.extend({
|
|||
|
||||
toggleOpenFile: function() {
|
||||
if (this.views.open) {
|
||||
this.showEntries();
|
||||
if (this.model.files.hasOpenFiles()) {
|
||||
this.showEntries();
|
||||
}
|
||||
} else {
|
||||
this.showOpenFile();
|
||||
}
|
||||
|
|
|
@ -157,7 +157,11 @@ var OpenView = Backbone.View.extend({
|
|||
this.params.path = file.path || null;
|
||||
this.params.storage = file.path ? 'file' : null;
|
||||
this.params.rev = null;
|
||||
if (!this.params.keyFileData) {
|
||||
this.params.keyFileName = null;
|
||||
}
|
||||
this.displayOpenFile();
|
||||
this.displayOpenKeyFile();
|
||||
success = true;
|
||||
break;
|
||||
case 'fileXml':
|
||||
|
@ -220,8 +224,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 +264,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 +405,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) {
|
||||
|
|
|
@ -73,7 +73,7 @@ app.openWindow = function(opts) {
|
|||
return new BrowserWindow(opts);
|
||||
};
|
||||
app.minimizeApp = function() {
|
||||
if (process.platform === 'win32') {
|
||||
if (process.platform !== 'darwin') {
|
||||
mainWindow.minimize();
|
||||
mainWindow.setSkipTaskbar(true);
|
||||
appIcon = new Tray(path.join(__dirname, 'icon.png'));
|
||||
|
@ -169,7 +169,7 @@ function saveMainWindowPosition() {
|
|||
}
|
||||
delete mainWindowPosition.changed;
|
||||
try {
|
||||
fs.writeFile(windowPositionFileName, JSON.stringify(mainWindowPosition), 'utf8');
|
||||
fs.writeFileSync(windowPositionFileName, JSON.stringify(mainWindowPosition), 'utf8');
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,11 @@
|
|||
Release notes
|
||||
-------------
|
||||
##### v1.1.1 (2016-04-07)
|
||||
Hotfix
|
||||
`+` minimize app on linux
|
||||
`+` display remembered keyfile name
|
||||
`-` fix #182: save window position on Windows
|
||||
|
||||
##### v1.1.0 (2016-04-05)
|
||||
Storage providers, one-time passwords, usability improvements
|
||||
`+` WebDAV
|
||||
|
|
Loading…
Reference in New Issue
Block a user