6.0.0-alpha.8 (#1458)

textadventures · Mar 1, 2025 · 26376fe · 26376fe
2 parents b489b14 + 54e99a4
commit 26376fe
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.0.0-alpha.7
+6.0.0-alpha.8
diff --git a/src/PlayerCore/Resources/playercore.js b/src/PlayerCore/Resources/playercore.js
@@ -698,16 +698,15 @@ function bindMenu(linkid, verbs, text, elementId) {
 function buildMenuOptions(verbs, text, elementId) {
     var verbsList = verbs.split("/");
     var options = [];
-    var metadata = new Object();
+    var metadata = {};
     metadata[text] = elementId;
-    var metadataString = JSON.stringify(metadata);
 
     $.each(verbsList, function (key, value) {
         options = options.concat({
             title: value,
             action: {
                 callback: function (selectedValue) {
-                    sendCommand(selectedValue.toLowerCase() + " " + text, metadataString);
+                    sendCommand(selectedValue.toLowerCase() + " " + text, metadata);
                 }
             }
         });
@@ -1431,7 +1430,7 @@ function SaveTranscript(text){
   writeToTranscript(text);  
 }
 
-var transcriptUrl = 'TranscriptViewer';
+var transcriptUrl = 'TranscriptViewer/index.html';
 
 // Another fallback to avoid errors
 function showTranscript(){

diff --git a/src/WebPlayer/TranscriptViewer/index.html → ...layer/wwwroot/TranscriptViewer/index.html b/src/WebPlayer/TranscriptViewer/index.html → ...layer/wwwroot/TranscriptViewer/index.html
diff --git a/src/WebPlayer/wwwroot/player.js b/src/WebPlayer/wwwroot/player.js
@@ -157,11 +157,7 @@ function sendCommand(text, metadata) {
 
     // TODO: See if setTimeout is still needed here
     window.setTimeout(async function () {
-        // TODO: Check metadata format
-        await WebPlayer.sendCommand(text, getTickCountAndStopTimer(), {
-            command: text,
-            metadata
-        });
+        await WebPlayer.sendCommand(text, getTickCountAndStopTimer(), metadata);
     }, 100);
 }
 
@@ -171,7 +167,7 @@ function ASLEvent(event, parameter) {
     // using setTimeout here to work around a double-submission race condition which seems to only affect Firefox,
     // even though we use "return false" to suppress submission of the form with the Enter key.
     window.setTimeout(async function () {
-        await WebPlayer.uiSendEvent(event, parameter);
+        await WebPlayer.uiSendEvent(event, "" + parameter);
     }, 100);
     return true;
 }
@@ -260,4 +256,42 @@ function addExternalScript(url) {
     const script = document.createElement("script");
     script.src = url;
     document.head.appendChild(script);
+}
+
+function WriteToLog(data){
+    // Do nothing.
+  }
+
+function WriteToTranscript(data){
+    if (noTranscript){
+      // Do nothing.
+      return;
+    }
+    if (!isLocalStorageAvailable()){
+      console.error("There is no localStorage. Disabling transcript functionality.");
+      noTranscript = true;
+      savingTranscript = false;
+      return;
+    }
+    var tName = transcriptName || "Transcript";
+    if (data.indexOf("___SCRIPTDATA___") > -1) {
+      tName = data.split("___SCRIPTDATA___")[0].trim() || tName;
+      data = data.split("___SCRIPTDATA___")[1];
+    }
+    var oldData = localStorage.getItem("questtranscript-" + tName) || "";
+    localStorage.setItem("questtranscript-" + tName, oldData + data);
+}
+
+// Make sure localStorage is available, hopefully without throwing any errors!
+
+/* https://stackoverflow.com/a/16427747 */
+function isLocalStorageAvailable(){
+    var test = 'test';
+    try {
+        localStorage.setItem(test, test);
+        localStorage.removeItem(test);
+        return true;
+    } catch(e) {
+        return false;
+    }
 }