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

fix #90: restored dragdrop support

This commit is contained in:
Antelle 2016-02-17 23:57:12 +03:00
parent f524dc9fc9
commit 7eba0bccef
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/views/details/details-view.js
View File

@ -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() {

4
app/scripts/views/list-view.js
View File

@ -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);
}
});

6
app/scripts/views/menu/menu-item-view.js
View File

@ -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;
}
},

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

@ -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) {