From 1bf7130978301b360b9a7cafe3ac95be9dc4611e Mon Sep 17 00:00:00 2001 From: KKamaa Date: Tue, 27 Dec 2022 09:40:43 +0300 Subject: [PATCH 1/2] [FIX] drag_drop element cannot be seen, if check for undefined value --- .../static/src/js/web_drop_target.js | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) 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 6e5c67710..b044cc826 100644 --- a/web_drop_target/static/src/js/web_drop_target.js +++ b/web_drop_target/static/src/js/web_drop_target.js @@ -151,18 +151,9 @@ odoo.define("web_drop_target", function (require) { * @private * @param {MouseEvent} ev */ - _onBodyFileDragover: function (ev) { + _onBodyFileDragover: function(ev) { ev.preventDefault(); - const actionManager = this.findAncestor(function (ancestor) { - return ancestor instanceof ActionManager; - }); - const controller = actionManager.currentDialogController; - if ( - _.isEmpty(this._get_drop_items(ev)) && - this._checkDragOver() && - (controller === undefined || - (controller && controller.jsID === this.controllerID)) - ) { + if (_.isEmpty(this._get_drop_items(ev)) && this._checkDragOver()) { const drop_zone_offset = this.$drop_zone.offset(); const overlay_css = { top: drop_zone_offset.top, @@ -173,8 +164,11 @@ odoo.define("web_drop_target", function (require) { if (!this._get_record_id()) { overlay_css.background = "#FF000020"; } - this._drop_overlay.css(overlay_css); - this._drop_overlay.removeClass("d-none"); + if (this._drop_overlay) { + this._drop_overlay.css(overlay_css); + this._drop_overlay.removeClass("d-none"); + } + } }, @@ -186,9 +180,10 @@ odoo.define("web_drop_target", function (require) { * @private * @param {MouseEvent} ev */ - _onBodyFileDrop: function (ev) { + _onBodyFileDrop: function(ev) { ev.preventDefault(); - this._drop_overlay.addClass("d-none"); + if (this._drop_overlay) + this._drop_overlay.addClass("d-none"); }, /** From 356bedbb381fc8e166ae424fed5a72f7bc783fbc Mon Sep 17 00:00:00 2001 From: KKamaa Date: Tue, 27 Dec 2022 10:44:35 +0300 Subject: [PATCH 2/2] [FIX] isort, black, prettier --- web_drop_target/static/src/js/web_drop_target.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 b044cc826..ac4fffc0d 100644 --- a/web_drop_target/static/src/js/web_drop_target.js +++ b/web_drop_target/static/src/js/web_drop_target.js @@ -5,7 +5,6 @@ odoo.define("web_drop_target", function (require) { "use strict"; - const ActionManager = require("web.ActionManager"); const FormController = require("web.FormController"); const core = require("web.core"); const qweb = core.qweb; @@ -151,7 +150,7 @@ odoo.define("web_drop_target", function (require) { * @private * @param {MouseEvent} ev */ - _onBodyFileDragover: function(ev) { + _onBodyFileDragover: function (ev) { ev.preventDefault(); if (_.isEmpty(this._get_drop_items(ev)) && this._checkDragOver()) { const drop_zone_offset = this.$drop_zone.offset(); @@ -168,7 +167,6 @@ odoo.define("web_drop_target", function (require) { this._drop_overlay.css(overlay_css); this._drop_overlay.removeClass("d-none"); } - } }, @@ -180,10 +178,9 @@ odoo.define("web_drop_target", function (require) { * @private * @param {MouseEvent} ev */ - _onBodyFileDrop: function(ev) { + _onBodyFileDrop: function (ev) { ev.preventDefault(); - if (this._drop_overlay) - this._drop_overlay.addClass("d-none"); + if (this._drop_overlay) this._drop_overlay.addClass("d-none"); }, /**