From 535b55471b8062f134898e84883e8ed4571a4bfa Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sat, 7 Dec 2024 11:03:54 -0600
Subject: [PATCH] Fixing Merchant being unusable

---
 .../src/main/web/js/gemp-022/cardFilter.js           | 12 +++++++-----
 .../src/main/web/js/gemp-022/cards/CardFilter.js     |  2 +-
 .../src/main/web/js/gemp-022/merchantUi.js           | 10 +++++-----
 gemp-lotr/gemp-lotr-async/src/main/web/merchant.html |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
index 59ed1864e..bd68ddcc2 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
@@ -1,4 +1,4 @@
-var CardFilter = Class.extend({
+var LegacyCardFilter = Class.extend({
     clearCollectionFunc: null,
     addCardFunc: null,
     finishCollectionFunc: null,
@@ -543,10 +543,12 @@ var CardFilter = Class.extend({
             sort = " sort:" + sort;
 
         var cardName = this.nameInput.val();
-        var cardNameElems = cardName.split(" ");
-        cardName = "";
-        for (var i = 0; i < cardNameElems.length; i++)
-            cardName += " name:" + cardNameElems[i];
+        if(cardName) {
+            var cardNameElems = cardName.split(" ");
+            cardName = "";
+            for (var i = 0; i < cardNameElems.length; i++)
+                cardName += " name:" + cardNameElems[i];
+        }
 
         var rarity = $("option:selected", this.raritySelect).prop("value");
         if (rarity != "")
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
index ff06016cf..9c44cefcc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
@@ -872,7 +872,7 @@ var CardFilter = Class.extend({
 			block = " block:" + block;
 		}
 		else {
-			block = "":
+			block = "";
 		}
 		
 		var set = $("#setSelect option:selected").prop("value");
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
index a496c8bc9..197a1cf9d 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
@@ -23,7 +23,7 @@ var GempLotrMerchantUI = Class.extend({
 
         this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
 
-        this.cardFilter = new CardFilter(cardFilterElem, 
+        this.cardFilter = new LegacyCardFilter(cardFilterElem, 
                 function (filter, start, count, callback) {
                     that.comm.getMerchant(filter, that.ownedMin, start, count, callback);
                 },
@@ -188,7 +188,7 @@ var GempLotrMerchantUI = Class.extend({
     displayCardInfo:function (card) {
         this.infoDialog.html("");
         this.infoDialog.html("<div style='scroll: auto'></div>");
-        this.infoDialog.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack()));
+        this.infoDialog.append(Card.CreateFullCardDiv(card.imageUrl, null, card.foil, card.horizontal, card.isPack()));
         if (card.hasWikiInfo())
             this.infoDialog.append("<div><a href='" + card.getWikiLink() + "' target='_blank'>Wiki</a></div>");
         var windowWidth = $(window).width();
@@ -233,13 +233,13 @@ var GempLotrMerchantUI = Class.extend({
 
         if (type == "pack") {
             card = new Card(blueprintId, "merchant", "collection", "player");
-            cardDiv = createCardDiv(card.imageUrl, null, false, true, true, false);
+            cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, false, true, true, false, false);
             cardDiv.data("card", card);
             cardDiv.data("sizeListeners", sizeListeners);
             this.cardsDiv.append(cardDiv);
         } else if (type == "card") {
             card = new Card(blueprintId, "merchant", "collection", "player");
-            cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), true, false, card.hasErrata());
+            cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), true, false, card.hasErrata(), false);
             cardDiv.data("card", card);
             cardDiv.data("sizeListeners", sizeListeners);
             this.cardsDiv.append(cardDiv);
@@ -303,7 +303,7 @@ var GempLotrMerchantUI = Class.extend({
         this.questionDialog.html("");
         this.questionDialog.html("<div style='scroll: auto'></div>");
         var floatCardDiv = $("<div style='float: left;'></div>");
-        floatCardDiv.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack()));
+        floatCardDiv.append(Card.CreateFullCardDiv(card.imageUrl, null, card.foil, card.horizontal, card.isPack()));
         if (card.hasWikiInfo())
             floatCardDiv.append("<div><a href='" + card.getWikiLink() + "' target='_blank'>Wiki</a></div>");
         this.questionDialog.append(floatCardDiv);
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
index 536fab07d..23cfd4cc9 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -30,7 +30,7 @@
     <script type="text/javascript" src="js/gemp-022/communication.js"></script>
     <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
     <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-022/cards/CardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/cards/CardGroup.js"></script>
     <script type="text/javascript" src="js/gemp-022/cards/Card.js"></script>