diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/pixel.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/pixel.png new file mode 100644 index 000000000..5ffd60314 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/pixel.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js index aa4d64bf8..f0b842ea6 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js @@ -135,15 +135,18 @@ var GempLotrDeckBuildingUI = Class.extend({ $("body").click(function (event) { var tar = $(event.target); - if (tar.hasClass("borderOverlay")) { - var selectedCardElem = tar.parent(); - if (event.which == 1) { - if (event.shiftKey) { - // that.displayCardInfo(selectedCardElem.data("card")); - } else if (selectedCardElem.hasClass("cardInCollection")) { - that.selectionFunc(selectedCardElem.data("card").blueprintId); - } else if (selectedCardElem.hasClass("cardInDeck")) { - that.removeCardFromDeck(selectedCardElem); + if (tar.hasClass("actionArea")) { + tar = tar.parent(); + if (tar.hasClass("borderOverlay")) { + var selectedCardElem = tar.parent(); + if (event.which == 1) { + if (event.shiftKey) { + // that.displayCardInfo(selectedCardElem.data("card")); + } else if (selectedCardElem.hasClass("cardInCollection")) { + that.selectionFunc(selectedCardElem.data("card").blueprintId); + } else if (selectedCardElem.hasClass("cardInDeck")) { + that.removeCardFromDeck(selectedCardElem); + } } } } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index 4551b0cc3..8a4e11e42 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -123,17 +123,24 @@ var GempLotrGameUI = Class.extend({ this.alert.css({"border-radius": "7px"}); $("#main").append(this.alert); + $("body").click( + function (event) { + that.clickCardFunction(event); + }); }, clickCardFunction: function(event) { var tar = $(event.target); - if (tar.hasClass("borderOverlay")) { - var selectedCardElem = tar.parent(); - if (event.which == 1) { - if (event.shiftKey) { - this.displayCardInfo(selectedCardElem.data("card")); - } else if (selectedCardElem.hasClass("selectableCard")) - this.selectionFunction(selectedCardElem.data("card").cardId); + if (tar.hasClass("actionArea")) { + tar = tar.parent(); + if (tar.hasClass("borderOverlay")) { + var selectedCardElem = tar.parent(); + if (event.which == 1) { + if (event.shiftKey) { + this.displayCardInfo(selectedCardElem.data("card")); + } else if (selectedCardElem.hasClass("selectableCard")) + this.selectionFunction(selectedCardElem.data("card").cardId); + } } } return false; @@ -612,10 +619,6 @@ var GempLotrGameUI = Class.extend({ }; cardDiv.swipe(swipeOptions); - $(".borderOverlay", cardDiv).click(function(event) { - that.clickCardFunction(event); - }); - return cardDiv; }, diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js index 0e1d1845c..9266707c4 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js @@ -81,7 +81,7 @@ function createCardDiv(image, text) { var cardDiv = $("