ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing it all to work in IE.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-06 23:14:30 +00:00
parent d05ec8b218
commit c0cdd0bbe0
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gemp-lotr/gemp-lotr-web/src/main/webapp/images/pixel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

21
gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
View File

@@ -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);
}
}
}
}

25
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
View File

@@ -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;
},

2
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
View File

@@ -81,7 +81,7 @@ function createCardDiv(image, text) {
var cardDiv = $("<div class='card'><img src='" + image + "' width='100%' height='100%'>" + ((text != null) ? text : "") + "</div>");
var overlayDiv = $("<div class='tokenOverlay'></div>");
cardDiv.append(overlayDiv);
var borderDiv = $("<div class='borderOverlay'></div>");
var borderDiv = $("<div class='borderOverlay'><img class='actionArea' src='/gemp-lotr/images/pixel.png' width='100%' height='100%'></div>");
cardDiv.append(borderDiv);
return cardDiv;