From c1e2f35c960593e04a69fcaad3f414eb484d14c1 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Mon, 15 Oct 2018 11:45:29 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B0931=20TagSet=20:=20fix=20remove/add=20of?= =?UTF-8?q?=20a=20partial=20value=20in=20bulk=20edit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.itop-set-widget.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/js/jquery.itop-set-widget.js b/js/jquery.itop-set-widget.js index 24a0e90be..27bf5bd44 100644 --- a/js/jquery.itop-set-widget.js +++ b/js/jquery.itop-set-widget.js @@ -178,9 +178,12 @@ $.widget('itop.set_widget', } }); - console.debug("bindEvents", setWidget.selectizeWidget); - setWidget.selectizeWidget.$control.on('click', '.attribute-set-item.partial-code', function () { - setWidget._onTagPartialClick(setWidget, this); + if (setWidget.options.isDebug) + { + console.debug("bindEvents", setWidget.selectizeWidget); + } + setWidget.selectizeWidget.$control.on('click', '.attribute-set-item.partial-code', function (event) { + setWidget._onTagPartialClick(setWidget, this, event); }) }, @@ -292,17 +295,25 @@ $.widget('itop.set_widget', this.refresh(); }, - _onTagPartialClick: function (setWidget, inputWidgetItemNode) { - if (setWidget.options.isDebug) { - console.debug("onTagPartialClick", setWidget, inputWidgetItemNode); + _onTagPartialClick: function (setWidget, inputWidgetItemNode, event) { + var $targetNode = $(event.target), + partialCodeClicked = $(inputWidgetItemNode).data("value"); + + if (setWidget.options.isDebug) + { + console.debug("onTagPartialClick", setWidget, inputWidgetItemNode, event); } - if (setWidget.selectizeWidget.isDisabled) { + + if (setWidget.selectizeWidget.isDisabled) + { + return; + } + if ($targetNode.is("a.remove")) + { return; } - var partialCodeClicked = $(inputWidgetItemNode).data("value"); this._onTagAdd(partialCodeClicked, $(inputWidgetItemNode), setWidget.selectizeWidget); - $(inputWidgetItemNode).removeClass(setWidget.ITEM_PARTIAL_CSS_CLASS); },