Merge branch 'master' into develop

app/scripts/auto-type/emitter/auto-type-emitter-linux.js

@@ -38,6 +38,7 @@ AutoTypeEmitter.prototype.setMod = function(mod, enabled) {
 };
 
 AutoTypeEmitter.prototype.text = function(text) {
+    this.pendingScript.push('keyup ctrl alt shift t');
     Object.keys(this.mod).forEach(mod => {
         this.pendingScript.push('keydown ' + ModMap[mod]);
     });

app/scripts/storage/storage-webdav.js

@@ -187,6 +187,9 @@ var StorageWebDav = StorageBase.extend({
                 xhr.setRequestHeader(header, value);
             });
         }
+        if (['GET', 'HEAD'].indexOf(config.method) >= 0) {
+            xhr.setRequestHeader('Cache-Control', 'no-cache');
+        }
         if (config.data) {
             var blob = new Blob([config.data], {type: 'application/octet-stream'});
             xhr.send(blob);

app/scripts/views/menu/menu-item-view.js

@@ -183,7 +183,12 @@ var MenuItemView = Backbone.View.extend({
 
     dropAllowed(e) {
         var types = e.originalEvent.dataTransfer.types;
-        return types.indexOf('text/group') >= 0 || types.indexOf('text/entry') >= 0;
+        for (let i = 0; i < types.length; i++) {
+            if (types[i] === 'text/group' || types[i] === 'text/entry') {
+                return true;
+            }
+        }
+        return false;
     },
 
     dragstart(e) {
@@ -229,7 +234,13 @@ var MenuItemView = Backbone.View.extend({
     },
 
     dropTopAllowed(e) {
-        return e.originalEvent.dataTransfer.types.indexOf('text/group') >= 0;
+        var types = e.originalEvent.dataTransfer.types;
+        for (let i = 0; i < types.length; i++) {
+            if (types[i] === 'text/group') {
+                return true;
+            }
+        }
+        return false;
     },
 
     dragoverTop(e) {

electron/app.js

@@ -226,8 +226,10 @@ function mainWindowBlur() {
 }
 
 function emitBackboneEvent(e, arg) {
-    arg = JSON.stringify(arg);
-    mainWindow.webContents.executeJavaScript(`Backbone.trigger('${e}', ${arg});`);
+    if (mainWindow && mainWindow.webContents) {
+        arg = JSON.stringify(arg);
+        mainWindow.webContents.executeJavaScript(`Backbone.trigger('${e}', ${arg});`);
+    }
 }
 
 function setMenu() {

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "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.3.1",
+  "version": "1.3.2",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "homepage": "https://keeweb.info",

release-notes.md

@@ -1,5 +1,11 @@
 Release notes
 -------------
+##### v1.3.2 (2016-09-13)
+`-` fix #342: url detection in Microsoft Edge  
+`-` fix #351: error alert on power shutdown  
+`-` fix #344: prevent caching WebDAV requests  
+`-` fix #363: drag-drop in Firefox  
+`-` fix #357: linux auto-type issues  
 
 ##### v1.4.0 (WIP)
 `+` support auto-type in edge  

util/config-example.json

@@ -6,16 +6,12 @@
     "menuViewWidth": null,
     "tagsViewHeight": null,
     "autoUpdate": "install",
-    "clipboardSeconds": 0,
     "autoSave": true,
     "rememberKeyFiles": false,
     "idleMinutes": 15,
-    "minimizeOnClose": false,
     "tableView": false,
     "colorfulIcons": false,
-    "lockOnMinimize": true,
     "lockOnCopy": false,
-    "helpTipCopyShown": false,
     "skipOpenLocalWarn": false,
     "hideEmptyFields": false,
     "skipHttpsWarning": false,