From adaf3a8c4136fe8bd8d3b82cfbf82a8a26ec52de Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 15 Sep 2011 00:11:06 +0000 Subject: [PATCH] Fixing card zoom-in on touchscreens and also allow to scroll the card image in the info dialog using swipes. --- .../src/main/webapp/js/gameUi.js | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) 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 5d9d21d43..288171c0c 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 @@ -223,6 +223,18 @@ var GempLotrGameUI = Class.extend({ height: 300 }); + var swipeOptions = { + threshold: 20, + swipeUp: function (event) { + that.infoDialog.prop({ scrollTop: that.infoDialog.prop("scrollHeight") }); + return false; + }, + swipeDown: function (event) { + that.infoDialog.prop({ scrollTop: 0 }); + return false; + } + }; + this.infoDialog.swipe(swipeOptions); }, layoutUI: function(sizeNotChanged) { @@ -716,9 +728,12 @@ var GempLotrGameUI = Class.extend({ threshold: 20, swipeUp: function (event) { var tar = $(event.target); - if (tar.hasClass("borderOverlay")) { - var selectedCardElem = tar.parent(); - that.displayCardInfo(selectedCardElem.data("card")); + if (tar.hasClass("actionArea")) { + tar = tar.parent(); + if (tar.hasClass("borderOverlay")) { + var selectedCardElem = tar.parent(); + that.displayCardInfo(selectedCardElem.data("card")); + } } return false; }