diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js index e2452fc40..fb63d8a05 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/deckBuildingUi.js @@ -500,6 +500,8 @@ var GempLotrDeckBuildingUI = Class.extend({ this.infoDialog.html(""); this.infoDialog.html("
"); this.infoDialog.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack())); + if (!card.isPack()) + this.infoDialog.append("
Wiki
"); var windowWidth = $(window).width(); var windowHeight = $(window).height(); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js index 3b688949f..cf5331ac0 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/jCards.js @@ -205,7 +205,7 @@ var Card = Class.extend({ return false; }, - getUrlByBlueprintId: function(blueprintId) { + getUrlByBlueprintId: function(blueprintId, ignoreErrata) { if (fixedImages[blueprintId] != null) return fixedImages[blueprintId]; @@ -217,7 +217,7 @@ var Card = Class.extend({ var cardNo = parseInt(blueprintId.substr(separator + 1)); var errata = this.getErrata(setNo, cardNo); - if (errata != null) + if (errata != null && (ignoreErrata === undefined || !ignoreErrata)) return errata; var mainLocation = this.getMainLocation(setNo, cardNo); @@ -232,6 +232,11 @@ var Card = Class.extend({ return mainLocation + "LOTR" + cardStr + (this.isTengwar() ? "T" : "") + ".jpg"; }, + getWikiLink: function() { + var imageUrl = this.getUrlByBlueprintId(this.blueprintId, true); + return imageUrl.substr(0, imageUrl.length - 3) + "html"; + }, + formatSetNo: function(setNo) { var setNoStr; if (setNo < 10) diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js index 6d8dee9a9..b93dda103 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-003/merchantUi.js @@ -183,6 +183,8 @@ var GempLotrMerchantUI = Class.extend({ this.infoDialog.html(""); this.infoDialog.html("
"); this.infoDialog.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack())); + if (!card.isPack()) + this.infoDialog.append("
Wiki
"); var windowWidth = $(window).width(); var windowHeight = $(window).height(); @@ -296,6 +298,8 @@ var GempLotrMerchantUI = Class.extend({ this.questionDialog.html("
"); var floatCardDiv = $("
"); floatCardDiv.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack())); + if (!card.isPack()) + floatCardDiv.append("
Wiki
"); this.questionDialog.append(floatCardDiv); var questionDiv = $("
" + text + "
"); questionDiv.append("
");