From ff000900f234a764bafe7d94dfd116d3bcb61342 Mon Sep 17 00:00:00 2001 From: "jakub.salavec" Date: Wed, 28 May 2025 17:02:14 +0200 Subject: [PATCH 1/3] Modified - hall default format set to fellowship block --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index cd0066887..a38749bf4 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -1155,6 +1155,9 @@ var GempLotrHallUI = Class.extend({ var type = formats[i].getAttribute("type"); var item = "" + + var selected = (format === "Fellowship Block") ? " selected" : ""; + var item = ""; this.supportedFormatsSelect.append(item); } From a2f822dd955a09e5422f70aa09c79cb20f47c129 Mon Sep 17 00:00:00 2001 From: "jakub.salavec" Date: Wed, 28 May 2025 17:41:27 +0200 Subject: [PATCH 2/3] Modified - deck builder's button to convert errata is disabled when the page loads --- .../gemp-lotr-async/src/main/web/deckBuild.html | 2 +- .../src/main/web/js/gemp-022/deckBuildingUi.js | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html index ef754a7b9..f097cd19d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html @@ -96,7 +96,7 @@ - diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js index 55b067dfe..1c6681d76 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js @@ -61,6 +61,7 @@ var GempLotrDeckBuildingUI = Class.extend({ cardInfoDialog: null, formats: null, + formatsInitialized:false, init:function () { var that = this; @@ -110,14 +111,14 @@ var GempLotrDeckBuildingUI = Class.extend({ that.setMapVisibility(false); } - //PC format or Anything Goes - if(formatCode.includes("pc") || formatCode == "rev_tow_sta") { + //PC format or Anything Goes (if chosen, not when being default when page loads) + if((formatCode.includes("pc") || formatCode == "rev_tow_sta") && that.formatsInitialized) { $("#convertErrataBut").button("option", "disabled", false); } else { $("#convertErrataBut").button("option", "disabled", true); } - + that.cardFilter.updateFormat(formatCode, that.formats[formatCode].blockFilters); }); @@ -1032,6 +1033,12 @@ var GempLotrDeckBuildingUI = Class.extend({ this.deckValidationDirty = true; this.deckContentsDirty = true; $("#editingDeck").html("*" + name + " - modified"); + + //Enable the errata button if user starts adding cards to empty 'Anything Goes' deck after the page was initialized + let formatCode = this.formatSelect.val(); + if(formatCode == "rev_tow_sta") { + $("#convertErrataBut").button("option", "disabled", false); + } } else { @@ -1122,6 +1129,8 @@ var GempLotrDeckBuildingUI = Class.extend({ const sleep = ms => new Promise(r => setTimeout(r, ms)); that.showNormalFilter(); + that.formatsInitialized = true; + that.getCollectionTypes(); }, { From 0b85a971f55c33f4f2c1f1e5034ea06e403fc330 Mon Sep 17 00:00:00 2001 From: "jakub.salavec" Date: Wed, 28 May 2025 18:25:20 +0200 Subject: [PATCH 3/3] Refactoring - deleting one line that I forgot to delete --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index a38749bf4..17f83c381 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -1153,8 +1153,6 @@ var GempLotrHallUI = Class.extend({ for (var i = 0; i < formats.length; i++) { var format = formats[i].childNodes[0].nodeValue; var type = formats[i].getAttribute("type"); - - var item = "" var selected = (format === "Fellowship Block") ? " selected" : ""; var item = "";