From 51623d007a9733214caf1da2910db06ffeaf4a03 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 27 Aug 2020 10:28:45 -0400
Subject: [PATCH] move out of globalThis
---
src/gui/storyCaption.tw | 2 +-
src/gui/userButton.js | 6 +++---
src/utility/miscWidgets.tw | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gui/storyCaption.tw b/src/gui/storyCaption.tw
index 3b76ccb2d5f..85d5e5f4667 100644
--- a/src/gui/storyCaption.tw
+++ b/src/gui/storyCaption.tw
@@ -2,7 +2,7 @@
<<set _Pass = passage()>>
-<<if $ui != "start">><p><<includeDOM userButton()>></p><</if>>
+<<if $ui != "start">><p><<includeDOM App.Utils.userButton()>></p><</if>>
<<if $ui != "start">>
<<if $cheatMode || $debugMode>>
diff --git a/src/gui/userButton.js b/src/gui/userButton.js
index f3cfd3caf59..0c8cf11d416 100644
--- a/src/gui/userButton.js
+++ b/src/gui/userButton.js
@@ -1,4 +1,4 @@
-globalThis.userButton = function(nextButton = V.nextButton, nextLink = V.nextLink) {
+App.Utils.userButton = function(nextButton = V.nextButton, nextLink = V.nextLink) {
const el = document.createElement("span");
el.id = "next-button-wrapper"; // We must always have a named element so we have something to refresh even if the button is hidden for a scene
const pass = passage();
@@ -35,6 +35,6 @@ globalThis.userButton = function(nextButton = V.nextButton, nextLink = V.nextLin
return el;
};
-globalThis.updateUserButton = function() {
- return jQuery("#next-button-wrapper").empty().append(userButton());
+App.Utils.updateUserButton = function() {
+ return jQuery("#next-button-wrapper").empty().append(App.Utils.userButton());
};
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 9d0a63faeb6..dccc305675c 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -7,7 +7,7 @@ Call as <<UpdateNextButton>>
Allows for dynamic updating of the next button in the storyCaption (left side-bar) for events that disable the button until user makes a selection
%/
<<widget "UpdateNextButton">>
- <<run updateUserButton()>>
+ <<run App.Utils.updateUserButton()>>
<</widget>>
<<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $enunciate>><<run Enunciate($activeSlave)>><</if>>$enunciate.title<</widget>>
--
GitLab