From ab64cf2aea45b51a29468909e00d414084906a08 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 1 Dec 2022 20:15:58 -0600 Subject: [PATCH] Removed "are you sure" nag prompt for opening packs. Added the ability to dismiss pack windows by pressing ESC --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 4 ++-- .../src/main/web/js/gemp-022/deliveryService.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js index 3c639f29a..cfcf39634 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js @@ -666,7 +666,7 @@ var GempLotrDeckBuildingUI = Class.extend({ cardData.tokens = {count:(parseInt(cardData.tokens["count"]) - 1)}; layoutTokens(selectedCardElem); } else if (selectedCardElem.hasClass("packInCollection")) { - if (confirm("Would you like to open this pack?")) { + // if (confirm("Would you like to open this pack?")) { this.comm.openPack(this.getCollectionType(), selectedCardElem.data("card").blueprintId, function () { that.cardFilter.getCollection(); }, { @@ -674,7 +674,7 @@ var GempLotrDeckBuildingUI = Class.extend({ alert("You have no pack of this type in your collection."); } }); - } + //} } else if (selectedCardElem.hasClass("cardToSelect")) { this.comm.openSelectionPack(this.getCollectionType(), this.packSelectionId, selectedCardElem.data("card").blueprintId, function () { that.cardFilter.getCollection(); diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js index 627d2065b..b31b41679 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js @@ -24,7 +24,7 @@ function deliveryService(xml) { deliveryDialogs[collectionName] = $("
").dialog({ title:"New items - " + collectionName, autoOpen:false, - closeOnEscape:false, + closeOnEscape:true, resizable:true, width:400, height:200,