From 5f19f8193648f53bd731a6ff095b535251484e58 Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 09:48:01 -0500 Subject: [PATCH 01/10] Enable debugging --- gemp-lotr/docker/gemp_app.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/docker/gemp_app.Dockerfile b/gemp-lotr/docker/gemp_app.Dockerfile index 4233e28e0..f94f58e9c 100644 --- a/gemp-lotr/docker/gemp_app.Dockerfile +++ b/gemp-lotr/docker/gemp_app.Dockerfile @@ -39,7 +39,7 @@ ARG USER_HOME_DIR="/root" ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" # Enables the JRE remote debugging; perhaps comment this out in a production build -#ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n +ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n ##################################################################### From 8a2f636dcff34a750cb38fad013aae813364408d Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 09:48:30 -0500 Subject: [PATCH 02/10] Attempt initial save guard --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 4 ++++ 1 file changed, 4 insertions(+) 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 e9be288bd..be1cf7ca0 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 @@ -148,6 +148,10 @@ var GempLotrDeckBuildingUI = Class.extend({ newDeckBut.click( function () { + if (that.deckContentsDirty && confirm("Do you wish to save this deck?")) + { + that.saveDeck(false); + } that.deckName = null; $("#editingDeck").text("New deck"); that.clearDeck(); From 814a957b1231cf8b08dfe33d40cf9d1cc76433ef Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 09:59:38 -0500 Subject: [PATCH 03/10] Begin copying new deck logic --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 be1cf7ca0..14f431c8f 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 @@ -150,7 +150,20 @@ var GempLotrDeckBuildingUI = Class.extend({ function () { if (that.deckContentsDirty && confirm("Do you wish to save this deck?")) { - that.saveDeck(false); + if (that.deckName == null) { + var newDeckName = prompt("Enter the name of the deck", ""); + if (newDeckName != null) { + if (newDeckName.length < 3 || newDeckName.length > 100) + alert("Deck name has to have at least 3 characters and at most 100 characters."); + else { + that.deckName = newDeckName; + $("#editingDeck").text(newDeckName); + that.saveDeck(false); + } + } + } else { + that.saveDeck(false); + } } that.deckName = null; $("#editingDeck").text("New deck"); From c14aefa04c80e430ab94bf7f3356baa7b4fcd16c Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:02:55 -0500 Subject: [PATCH 04/10] Try normalizing new deck effect --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 14f431c8f..202e06aeb 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 @@ -157,17 +157,23 @@ var GempLotrDeckBuildingUI = Class.extend({ alert("Deck name has to have at least 3 characters and at most 100 characters."); else { that.deckName = newDeckName; - $("#editingDeck").text(newDeckName); that.saveDeck(false); + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); } } } else { that.saveDeck(false); + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); } + } else { + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); } - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); }); saveDeckBut.click( From f71eda27ac017a610a9057c8262c5c24736c6492 Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:07:39 -0500 Subject: [PATCH 05/10] Correct logic --- .../main/web/js/gemp-022/deckBuildingUi.js | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) 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 202e06aeb..cbfad30f6 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 @@ -148,26 +148,27 @@ var GempLotrDeckBuildingUI = Class.extend({ newDeckBut.click( function () { - if (that.deckContentsDirty && confirm("Do you wish to save this deck?")) - { - if (that.deckName == null) { - var newDeckName = prompt("Enter the name of the deck", ""); - if (newDeckName != null) { - if (newDeckName.length < 3 || newDeckName.length > 100) - alert("Deck name has to have at least 3 characters and at most 100 characters."); - else { - that.deckName = newDeckName; - that.saveDeck(false); - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); + if (that.deckContentsDirty) { + if (confirm("Do you wish to save this deck?")) { + if (that.deckName == null) { + var newDeckName = prompt("Enter the name of the deck", ""); + if (newDeckName != null) { + if (newDeckName.length < 3 || newDeckName.length > 100) + alert("Deck name has to have at least 3 characters and at most 100 characters."); + else { + that.deckName = newDeckName; + that.saveDeck(false); + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); + } } + } else { + that.saveDeck(false); + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); } - } else { - that.saveDeck(false); - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); } } else { that.deckName = null; From b7d8b068880d4d0dc49dffa13d32ce4be80fc75d Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:35:57 -0500 Subject: [PATCH 06/10] Refactor deck naming --- .../main/web/js/gemp-022/deckBuildingUi.js | 55 +++++++------------ 1 file changed, 21 insertions(+), 34 deletions(-) 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 cbfad30f6..eb9f4e0af 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 @@ -150,25 +150,7 @@ var GempLotrDeckBuildingUI = Class.extend({ function () { if (that.deckContentsDirty) { if (confirm("Do you wish to save this deck?")) { - if (that.deckName == null) { - var newDeckName = prompt("Enter the name of the deck", ""); - if (newDeckName != null) { - if (newDeckName.length < 3 || newDeckName.length > 100) - alert("Deck name has to have at least 3 characters and at most 100 characters."); - else { - that.deckName = newDeckName; - that.saveDeck(false); - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); - } - } - } else { - that.saveDeck(false); - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); - } + that.saveCurrentDeck(); } } else { that.deckName = null; @@ -179,20 +161,7 @@ var GempLotrDeckBuildingUI = Class.extend({ saveDeckBut.click( function () { - if (that.deckName == null) { - var newDeckName = prompt("Enter the name of the deck", ""); - if (newDeckName == null) - return; - if (newDeckName.length < 3 || newDeckName.length > 100) - alert("Deck name has to have at least 3 characters and at most 100 characters."); - else { - that.deckName = newDeckName; - $("#editingDeck").text(newDeckName); - that.saveDeck(true); - } - } else { - that.saveDeck(false); - } + that.saveCurrentDeck(); }); renameDeckBut.click( @@ -374,7 +343,25 @@ var GempLotrDeckBuildingUI = Class.extend({ this.showMap = value; this.layoutUI(true); }, - + + saveCurrentDeck:function() { + var that = this; + if (that.deckName == null) { + var newDeckName = prompt("Enter the name of the deck", ""); + if (newDeckName == null) + return; + if (newDeckName.length < 3 || newDeckName.length > 100) + alert("Deck name has to have at least 3 characters and at most 100 characters."); + else { + that.deckName = newDeckName; + $("#editingDeck").text(newDeckName); + that.saveDeck(true); + } + } else { + that.saveDeck(false); + } + }, + renameCurrentDeck:function() { var that = this; that.renameDeck(that.deckName, function (newDeckName) { From d32e1ab6a6e5fb68f75965fc2898a72f0390bc40 Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:41:15 -0500 Subject: [PATCH 07/10] Fix new effect --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 eb9f4e0af..5d8c83ed3 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 @@ -150,7 +150,11 @@ var GempLotrDeckBuildingUI = Class.extend({ function () { if (that.deckContentsDirty) { if (confirm("Do you wish to save this deck?")) { - that.saveCurrentDeck(); + if (that.saveCurrentDeck()) { + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); + } } } else { that.deckName = null; @@ -346,20 +350,26 @@ var GempLotrDeckBuildingUI = Class.extend({ saveCurrentDeck:function() { var that = this; + var saved = false; + if (that.deckName == null) { var newDeckName = prompt("Enter the name of the deck", ""); if (newDeckName == null) - return; + return saved; if (newDeckName.length < 3 || newDeckName.length > 100) alert("Deck name has to have at least 3 characters and at most 100 characters."); else { that.deckName = newDeckName; $("#editingDeck").text(newDeckName); that.saveDeck(true); + saved = true; } } else { that.saveDeck(false); + saved = true; } + + return saved; }, renameCurrentDeck:function() { From 8d8ba2179a44db8f5930ff1a60140c08e608d1f9 Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:50:32 -0500 Subject: [PATCH 08/10] Refactor new deck logic --- .../src/main/web/js/gemp-022/deckBuildingUi.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 5d8c83ed3..7b3f8b11e 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 @@ -148,15 +148,8 @@ var GempLotrDeckBuildingUI = Class.extend({ newDeckBut.click( function () { - if (that.deckContentsDirty) { - if (confirm("Do you wish to save this deck?")) { - if (that.saveCurrentDeck()) { - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); - } - } - } else { + if (!that.deckContentsDirty || + (confirm("Do you wish to save this deck?") && that.saveCurrentDeck())) { that.deckName = null; $("#editingDeck").text("New deck"); that.clearDeck(); From cbd33e126f2deb5656842178511f28a6864e5cf1 Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:50:43 -0500 Subject: [PATCH 09/10] Revert "Enable debugging" This reverts commit 5f19f8193648f53bd731a6ff095b535251484e58. --- gemp-lotr/docker/gemp_app.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/docker/gemp_app.Dockerfile b/gemp-lotr/docker/gemp_app.Dockerfile index f94f58e9c..4233e28e0 100644 --- a/gemp-lotr/docker/gemp_app.Dockerfile +++ b/gemp-lotr/docker/gemp_app.Dockerfile @@ -39,7 +39,7 @@ ARG USER_HOME_DIR="/root" ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" # Enables the JRE remote debugging; perhaps comment this out in a production build -ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n +#ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n ##################################################################### From aaa30b6675fb5a5a781780c47ff7ddee0073d4aa Mon Sep 17 00:00:00 2001 From: Nathaniel Bond Date: Mon, 30 Dec 2024 10:59:23 -0500 Subject: [PATCH 10/10] Use tabs --- .../main/web/js/gemp-022/deckBuildingUi.js | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) 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 7b3f8b11e..9aec8b025 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 @@ -148,12 +148,12 @@ var GempLotrDeckBuildingUI = Class.extend({ newDeckBut.click( function () { - if (!that.deckContentsDirty || - (confirm("Do you wish to save this deck?") && that.saveCurrentDeck())) { - that.deckName = null; - $("#editingDeck").text("New deck"); - that.clearDeck(); - } + if (!that.deckContentsDirty || + (confirm("Do you wish to save this deck?") && that.saveCurrentDeck())) { + that.deckName = null; + $("#editingDeck").text("New deck"); + that.clearDeck(); + } }); saveDeckBut.click( @@ -345,25 +345,25 @@ var GempLotrDeckBuildingUI = Class.extend({ var that = this; var saved = false; - if (that.deckName == null) { - var newDeckName = prompt("Enter the name of the deck", ""); - if (newDeckName == null) - return saved; - if (newDeckName.length < 3 || newDeckName.length > 100) - alert("Deck name has to have at least 3 characters and at most 100 characters."); - else { - that.deckName = newDeckName; - $("#editingDeck").text(newDeckName); - that.saveDeck(true); - saved = true; - } - } else { - that.saveDeck(false); - saved = true; - } + if (that.deckName == null) { + var newDeckName = prompt("Enter the name of the deck", ""); + if (newDeckName == null) + return saved; + if (newDeckName.length < 3 || newDeckName.length > 100) + alert("Deck name has to have at least 3 characters and at most 100 characters."); + else { + that.deckName = newDeckName; + $("#editingDeck").text(newDeckName); + that.saveDeck(true); + saved = true; + } + } else { + that.saveDeck(false); + saved = true; + } - return saved; - }, + return saved; + }, renameCurrentDeck:function() { var that = this;