Browse Source

Merge pull request #1209 from daramousk/10.0-fix-web_drop_target

[FIX] web_drop_target
pull/1217/head
Simone Orsi 6 years ago
committed by GitHub
parent
commit
252de06873
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      web_drop_target/__manifest__.py
  2. 3
      web_drop_target/static/src/js/web_drop_target.js

2
web_drop_target/__manifest__.py

@ -3,7 +3,7 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{ {
"name": "Drop target support", "name": "Drop target support",
"version": "10.0.1.0.0",
"version": "10.0.1.0.1",
"author": "Therp BV,Odoo Community Association (OCA)", "author": "Therp BV,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web", "website": "https://github.com/OCA/web",
"license": "AGPL-3", "license": "AGPL-3",

3
web_drop_target/static/src/js/web_drop_target.js

@ -28,7 +28,7 @@ odoo.define('web_drop_target', function(require) {
_on_drop: function(e) { _on_drop: function(e) {
var drop_item = this._get_drop_item(e); var drop_item = this._get_drop_item(e);
if(!drop_item) {
if(!drop_item || !(drop_item.getAsFile() instanceof Blob)) {
return; return;
} }
jQuery(e.delegateTarget).removeClass(this._drag_over_class); jQuery(e.delegateTarget).removeClass(this._drag_over_class);
@ -37,6 +37,7 @@ odoo.define('web_drop_target', function(require) {
_.partial(this._handle_file_drop, drop_item.getAsFile()) _.partial(this._handle_file_drop, drop_item.getAsFile())
); );
reader.readAsArrayBuffer(drop_item.getAsFile()); reader.readAsArrayBuffer(drop_item.getAsFile());
e.stopPropagation();
e.preventDefault(); e.preventDefault();
}, },

Loading…
Cancel
Save