diff --git a/web_drop_target/__manifest__.py b/web_drop_target/__manifest__.py index 831725acb..8f550cc59 100644 --- a/web_drop_target/__manifest__.py +++ b/web_drop_target/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Drop target support", - "version": "11.0.1.0.0", + "version": "11.0.2.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/web", "license": "AGPL-3", diff --git a/web_drop_target/readme/CONTRIBUTORS.rst b/web_drop_target/readme/CONTRIBUTORS.rst index 001a3cc88..4230b091a 100644 --- a/web_drop_target/readme/CONTRIBUTORS.rst +++ b/web_drop_target/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ * Holger Brunn * Pablo Fuentes -* Akim Juillerat \ No newline at end of file +* Akim Juillerat +* Enric Tobella diff --git a/web_drop_target/readme/DEVELOP.rst b/web_drop_target/readme/DEVELOP.rst index 9276685bc..b91df8e2d 100644 --- a/web_drop_target/readme/DEVELOP.rst +++ b/web_drop_target/readme/DEVELOP.rst @@ -1,3 +1,3 @@ **Libraries** -* `base64js `_. \ No newline at end of file +* `base64js `_. diff --git a/web_drop_target/readme/ROADMAP.rst b/web_drop_target/readme/ROADMAP.rst index cffa99158..486912d63 100644 --- a/web_drop_target/readme/ROADMAP.rst +++ b/web_drop_target/readme/ROADMAP.rst @@ -2,4 +2,4 @@ * handle multiple files * add an upload progress meter for huge files * trigger custom events about different stages of the drop operation for other addons to hook in -* Install document module to display attachments in the sidebar \ No newline at end of file +* Install document module to display attachments in the sidebar diff --git a/web_drop_target/static/src/js/web_drop_target.js b/web_drop_target/static/src/js/web_drop_target.js index 6f0073b7b..4f9c5ed57 100644 --- a/web_drop_target/static/src/js/web_drop_target.js +++ b/web_drop_target/static/src/js/web_drop_target.js @@ -3,8 +3,8 @@ /*global Uint8Array base64js*/ odoo.define('web_drop_target', function(require) { - var FormController = require('web.FormController'); - var core = require('web.core'); + var FormController = require('web.FormController'); + var core = require('web.core'); var qweb = core.qweb; // this is the main contribution of this addon: A mixin you can use @@ -26,10 +26,13 @@ odoo.define('web_drop_target', function(require) { }, _on_drop: function(e) { + if (!this._drop_overlay){ + return; + } var drop_items = this._get_drop_items(e); e.preventDefault(); this._remove_overlay(); - if(!drop_items) { + if (!drop_items) { return; } this._handle_drop_items(drop_items, e) @@ -51,7 +54,7 @@ odoo.define('web_drop_target', function(require) { dataTransfer = e.originalEvent.dataTransfer, drop_items = []; _.each(dataTransfer.files, function(item) { - if( + if ( _.contains(self._drop_allowed_types, item.type) || _.isEmpty(self._drop_allowed_types) ) { @@ -92,9 +95,9 @@ odoo.define('web_drop_target', function(require) { while(p && !p.sidebar) { p = p.getParent ? p.getParent() : null; } - if(p) { + if (p) { var sidebar = p.sidebar; - if(sidebar && _.isFunction(sidebar._onFileUploaded)) { + if (sidebar && _.isFunction(sidebar._onFileUploaded)) { sidebar._onFileUploaded(); } } @@ -110,7 +113,7 @@ odoo.define('web_drop_target', function(require) { ) { var self = this; var file = item; - if(!file || !(file instanceof Blob)) { + if (!file || !(file instanceof Blob)) { return; } var reader = new FileReader(); @@ -122,7 +125,7 @@ odoo.define('web_drop_target', function(require) { }, _add_overlay: function() { - if(!this._drop_overlay){ + if (!this._drop_overlay){ var o_content = jQuery('.o_content'), view_manager = jQuery('.o_view_manager_content'); this._drop_overlay = jQuery( @@ -152,7 +155,7 @@ odoo.define('web_drop_target', function(require) { FormController.include(_.extend(DropTargetMixin, { _get_drop_file: function() { // disable drag&drop when we're on an unsaved record - if(!this.datarecord.id) { + if (!this.datarecord.id) { return null; } return this._super.apply(this, arguments);