Merge branch 'release-1.5'

app/scripts/models/app-model.js

@@ -476,6 +476,7 @@ const AppModel = Backbone.Model.extend({
 
     openFileWithData: function(params, callback, fileInfo, data, updateCacheOnSuccess) {
         const logger = new Logger('open', params.name);
+        let needLoadKeyFile = false;
         if (!params.keyFileData && fileInfo && fileInfo.get('keyFileName')) {
             params.keyFileName = fileInfo.get('keyFileName');
             if (this.settings.get('rememberKeyFiles') === 'data') {
@@ -483,14 +484,7 @@ const AppModel = Backbone.Model.extend({
             } else if (this.settings.get('rememberKeyFiles') === 'path' && fileInfo.get('keyFilePath')) {
                 params.keyFilePath = fileInfo.get('keyFilePath');
                 if (Storage.file.enabled) {
-                    Storage.file.load(params.keyFilePath, {}, (err, data, stat) => {
-                        if (err) {
-                            logger.info('Storage load error', err);
-                            callback(err);
-                        } else {
-                            params.keyFileData = data;
-                        }
-                    });
+                    needLoadKeyFile = true;
                 }
             }
         }
@@ -504,7 +498,7 @@ const AppModel = Backbone.Model.extend({
             backup: fileInfo && fileInfo.get('backup') || null,
             fingerprint: fileInfo && fileInfo.get('fingerprint') || null
         });
-        file.open(params.password, data, params.keyFileData, err => {
+        const openComplete = err => {
             if (err) {
                 return callback(err);
             }
@@ -532,7 +526,23 @@ const AppModel = Backbone.Model.extend({
             this.addFile(file);
             callback(null, file);
             this.fileOpened(file, data, params);
-        });
+        };
+        const open = () => {
+            file.open(params.password, data, params.keyFileData, openComplete);
+        };
+        if (needLoadKeyFile) {
+            Storage.file.load(params.keyFilePath, {}, (err, data) => {
+                if (err) {
+                    logger.info('Storage load error', err);
+                    callback(err);
+                } else {
+                    params.keyFileData = data;
+                    open();
+                }
+            });
+        } else {
+            open();
+        }
     },
 
     importFileWithXml: function(params, callback) {

app/scripts/models/entry-model.js

@@ -615,7 +615,7 @@ const EntryModel = Backbone.Model.extend({
 
     cloneEntry: function(nameSuffix) {
         const newEntry = EntryModel.newEntry(this.group, this.file);
-        const uuid = newEntry.uuid;
+        const uuid = newEntry.entry.uuid;
         newEntry.entry.copyFrom(this.entry);
         newEntry.entry.uuid = uuid;
         newEntry.entry.times.update();

app/scripts/views/list-view.js

@@ -218,7 +218,7 @@ const ListView = Backbone.View.extend({
     },
 
     setSize: function(size) {
-        this.$el.css({ width: null, height: null });
+        this.$el.css({ width: 'auto', height: 'auto' });
         if (size) {
             this.$el.css('flex', '0 0 ' + size + 'px');
         } else {

app/styles/areas/_app.scss

@@ -5,7 +5,7 @@
   flex-direction: column;
   justify-content: flex-start;
 
-  .titlebar-hidden & {
+  .titlebar-hidden-inset & {
     -webkit-app-region: drag;
   }
 

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "main.js",
   "homepage": "https://keeweb.info",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "private": true,

release-notes.md

@@ -1,5 +1,11 @@
 Release notes
 -------------
+##### v1.5.4 (2017-06-03)
+`-` fix #649: loading keyfiles with path  
+`-` fix #645: layout issues while switching table view  
+`-` fix #651: window drag style  
+`-` fix #652: create a copy bug  
+
 ##### v1.5.3 (2017-05-29)
 `-` fix #638: password generator drag issues  
 `-` fix #636: broken layout in edge 15