From e94f5335547627790f43c92030630b9211bb78be Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 15 Apr 2021 16:22:50 +0200 Subject: [PATCH] Message correctly deleted. Pop-up displayed --- src/main/resources/static/js/datatransfer.js | 15 ++++++++++----- target/classes/static/js/datatransfer.js | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 815cdc3..94c41f0 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -284,13 +284,18 @@ function fillMessageList(){ innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType); } $("#listItems").append(innerHTML); - $('.tile').click(function() { - console.log(this); - callLoadMessage(parseInt($(this).attr('tileid'))); + $('.tile').click(function(e) { + var element = $(this); + var button = element.find('.btn-tile').children().get(0); + console.log(button == e.target); + if(!(button == e.target)){ + console.log("Button is not a target. Loading message.") + callLoadMessage(parseInt($(this).attr('tileid'))); + } }); $('.btn-tile').click(function(){ - console.log(this); - removeMessage($(this).closest('.tile').attr('tileId')); + // console.log(this); + callRemoveMessage($(this).closest('.tile').attr('tileId')); }) } diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index 815cdc3..94c41f0 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -284,13 +284,18 @@ function fillMessageList(){ innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType); } $("#listItems").append(innerHTML); - $('.tile').click(function() { - console.log(this); - callLoadMessage(parseInt($(this).attr('tileid'))); + $('.tile').click(function(e) { + var element = $(this); + var button = element.find('.btn-tile').children().get(0); + console.log(button == e.target); + if(!(button == e.target)){ + console.log("Button is not a target. Loading message.") + callLoadMessage(parseInt($(this).attr('tileid'))); + } }); $('.btn-tile').click(function(){ - console.log(this); - removeMessage($(this).closest('.tile').attr('tileId')); + // console.log(this); + callRemoveMessage($(this).closest('.tile').attr('tileId')); }) }