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

Fixing NREs in card display code

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-12-07 15:43:58 -06:00
parent 9bb7a83886
commit 0c32b2558e
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/autoZoomHandler.js
View File

@@ -244,6 +244,8 @@ class AutoZoom {
const refCard = target.closest(".card"); const refCard = target.closest(".card");
this.baseImageDiv = refCard[0]; this.baseImageDiv = refCard[0];
var card = refCard.data("card"); var card = refCard.data("card");
if(card == null)
return;
// don't show preview image if card is animating // don't show preview image if card is animating
if (!$(this.baseImageDiv).hasClass('card-animating')) { if (!$(this.baseImageDiv).hasClass('card-animating')) {

1
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/Card.js
View File

@@ -615,6 +615,7 @@ class Card {
//Used for ephemeral card displays such as event display or the "affected by card" effect //Used for ephemeral card displays such as event display or the "affected by card" effect
static CreateSimpleCardDiv(image, testingText, foil, incomplete, borderWidth) { static CreateSimpleCardDiv(image, testingText, foil, incomplete, borderWidth) {
var foilPresentation = Card.getFoilPresentation();
var cardDiv = $("<div class='card'><img src='" + image + "' width='100%' height='100%'></div>"); var cardDiv = $("<div class='card'><img src='" + image + "' width='100%' height='100%'></div>");
if (incomplete) { if (incomplete) {