Merge branch 'release-1.0'

app/scripts/mixins/scrollable.js

@@ -24,11 +24,6 @@ var Scrollable = {
     removeScroll: function() {
         if (this.scroll) {
             this.scroll.dispose();
-            // TODO: remove once the bug in custom scrollbar is resolved
-            var ix = baron._instances.indexOf(this.scroll[0]);
-            if (ix >= 0) {
-                baron._instances.splice(ix, 1);
-            }
             this.scroll = null;
         }
     },

app/scripts/views/details/details-view.js

@@ -386,7 +386,7 @@ var DetailsView = Backbone.View.extend({
         }
         this.$el.find('.details').removeClass('details--drag');
         this.dragging = false;
-        var files = e.target.files || e.dataTransfer.files;
+        var files = e.target.files || e.originalEvent.dataTransfer.files;
         _.forEach(files, function(file) {
             var reader = new FileReader();
             reader.onload = (function() {

app/scripts/views/list-view.js

@@ -203,8 +203,8 @@ var ListView = Backbone.View.extend({
     itemDragStart: function(e) {
         e.stopPropagation();
         var id = $(e.target).closest('.list__item').attr('id');
-        e.dataTransfer.setData('text/entry', id);
-        e.dataTransfer.effectAllowed = 'move';
+        e.originalEvent.dataTransfer.setData('text/entry', id);
+        e.originalEvent.dataTransfer.effectAllowed = 'move';
         DragDropInfo.dragObject = this.items.get(id);
     }
 });

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

@@ -173,14 +173,14 @@ var MenuItemView = Backbone.View.extend({
     },
 
     dropAllowed: function(e) {
-        return ['text/group', 'text/entry'].indexOf(e.dataTransfer.types[0]) >= 0;
+        return ['text/group', 'text/entry'].indexOf(e.originalEvent.dataTransfer.types[0]) >= 0;
     },
 
     dragstart: function(e) {
         e.stopPropagation();
         if (this.model.get('drag')) {
-            e.dataTransfer.setData('text/group', this.model.id);
-            e.dataTransfer.effectAllowed = 'move';
+            e.originalEvent.dataTransfer.setData('text/group', this.model.id);
+            e.originalEvent.dataTransfer.effectAllowed = 'move';
             DragDropInfo.dragObject = this.model;
         }
     },

app/scripts/views/open-view.js

@@ -251,7 +251,7 @@ var OpenView = Backbone.View.extend({
             clearTimeout(this.dragTimeout);
         }
         this.$el.removeClass('open--drag');
-        var files = e.target.files || e.dataTransfer.files;
+        var files = e.target.files || e.originalEvent.dataTransfer.files;
         var dataFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'kdbx'; });
         var keyFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'key'; });
         if (dataFile) {

bower.json

@@ -24,7 +24,7 @@
   "private": true,
   "dependencies": {
     "backbone": "~1.2.3",
-    "baron": "~2.0.1",
+    "baron": "~2.0.2",
     "bourbon": "~4.2.5",
     "dropbox": "antelle/dropbox-js#0.10.6",
     "font-awesome": "~4.4.0",

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "KeePass web app",
   "main": "main.js",
   "repository": "https://github.com/antelle/keeweb",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "KeePass web app",
   "main": "Gruntfile.js",
   "repository": "https://github.com/antelle/keeweb",

release-notes.md

@@ -1,5 +1,9 @@
 Release notes
 -------------
+##### v1.0.2 (2016-02-17)
+Hotfix  
+`-` #80: dragdrop bug  
+
 ##### v1.0.1 (2016-02-14)
 Bugfixes  
 `-` fixed tags selection