fixed set editor ref logic, added check to see if message is undefined

microsoft · Jan 8, 2024 · 2b8e142 · 2b8e142
1 parent 4e33d63
commit 2b8e142
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/teachertool/src/services/makecodeEditorService.ts b/teachertool/src/services/makecodeEditorService.ts
@@ -32,7 +32,7 @@ function sendMessageAsync(message?: any) {
             makecodeEditorRef!.contentWindow!.postMessage(message, "*");
         }
 
-        messageQueue.push(message);
+        if (message) messageQueue.push(message);
         if (makecodeEditorRef) {
             while (messageQueue.length) {
                 sendMessageCore(messageQueue.shift());
@@ -42,12 +42,11 @@ function sendMessageAsync(message?: any) {
 }
 
 export function setEditorRef(ref: HTMLIFrameElement | undefined) {
+    makecodeEditorRef = ref ?? undefined;
+    window.removeEventListener("message", onMessageReceived);
     if (ref) {
-        makecodeEditorRef = ref;
         window.addEventListener("message", onMessageReceived);
-    } else {
-        makecodeEditorRef = undefined;
-        window.removeEventListener("message", onMessageReceived);
+        sendMessageAsync();
     }
 }