From 696546ecaae0f69c316916a48f39719adcf079ad Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Wed, 24 Jul 2024 13:33:20 -0400
Subject: [PATCH 1/4] Refresh MathJax if necessary.

---
 .../SlideshowDopplerCalc5.vue                 | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
index 3a160241c..b099348e4 100644
--- a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
+++ b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
@@ -52,7 +52,6 @@
             <v-card-text
                 v-intersect="typesetMathJax"
                 class="pt-8"
-            >
               <p>
                 Great! Now we'll continue the velocity calculation process in the sequence of this pop-up window to give
                 ourselves some more space to work.
@@ -927,14 +926,31 @@ mjx-mpadded {
 <script>
 export default {
   methods: {
-    typesetMathJax(entries, _observer, intersecting) {
+    mathJaxObserver(entries, _observer, intersecting) {
       if (intersecting) {
         this.$nextTick(() => {
-          MathJax.typesetPromise(entries.map(entry => entry.target));
+          this.refreshMathJax(entries.map(entry => entry.target));
         });
+        this.refreshMathJax(entries.map(entry => entry.target));
       }
     },
 
+    removeMathJax(containers) {
+      containers.forEach(container => container.querySelectorAll("mjx-container").forEach(el => container.remove(el)));
+      MathJax.typesetClear(containers);
+    },
+
+    refreshMathJax(containers) {
+      const containersToReset = containers.filter(this.containsMathJax);
+      this.removeMathJax(containersToReset);
+      MathJax.typesetPromise(containersToReset);
+    },
+
+    containsMathJax(container) {
+      const mathJaxOpeningDelimiters = [ "$$", "\\(", "\\[" ];
+      return mathJaxOpeningDelimiters.some(delim => container.innerHTML.includes(delim));
+    },
+
     getValue(inputID) {
       const input = document.getElementById(inputID);
       if (!input) {

From fb770f1a82a01f8ddbf78dcb7674fd5e4ace5728 Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Thu, 2 Jan 2025 16:50:58 -0500
Subject: [PATCH 2/4] New MathJax is rendering, but old MathJax isn't being
 cleared.

---
 .../SlideshowDopplerCalc5.vue                 | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
index b099348e4..d8f310c28 100644
--- a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
+++ b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
@@ -50,8 +50,9 @@
         >
           <v-lazy>
             <v-card-text
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
                 class="pt-8"
+            >
               <p>
                 Great! Now we'll continue the velocity calculation process in the sequence of this pop-up window to give
                 ourselves some more space to work.
@@ -161,7 +162,7 @@
         >
           <v-lazy>
             <v-card-text
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
                 class="pt-8"
             >
               <v-card
@@ -276,7 +277,7 @@
         >
           <v-lazy>
             <v-card-text
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
                 class="pt-8"
             >
               <v-card
@@ -394,7 +395,7 @@
         >
           <v-lazy>
             <v-card-text
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
                 class="pt-8"
             >
               <v-card
@@ -521,7 +522,7 @@
         >
           <v-lazy>
             <v-card-text
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
                 class="pt-8"
             >
               <p>
@@ -655,11 +656,12 @@
 
         <v-window-item :value="5"
                        class="no-transition"
+                       ref="last_step"
         >
           <v-lazy>
             <v-card-text
                 class="pt-8"
-                v-intersect="typesetMathJax"
+                v-intersect="mathJaxObserver"
             >
               <v-card
                   class="past_block pa-3"
@@ -931,19 +933,19 @@ export default {
         this.$nextTick(() => {
           this.refreshMathJax(entries.map(entry => entry.target));
         });
-        this.refreshMathJax(entries.map(entry => entry.target));
       }
     },
 
     removeMathJax(containers) {
-      containers.forEach(container => container.querySelectorAll("mjx-container").forEach(el => container.remove(el)));
+      // containers.forEach(container => container.querySelectorAll("mjx-container").forEach(el => container.remove(el)));
       MathJax.typesetClear(containers);
     },
 
     refreshMathJax(containers) {
       const containersToReset = containers.filter(this.containsMathJax);
       this.removeMathJax(containersToReset);
-      MathJax.typesetPromise(containersToReset);
+      this.$forceUpdate();
+      this.$nextTick(() => MathJax.typesetPromise(containersToReset));
     },
 
     containsMathJax(container) {
@@ -982,6 +984,12 @@ export default {
       const isInteractStep = this.interact_steps_5.includes(newStep);
       const newCompleted = isInteractStep ? newStep - 1 : newStep;
       this.set_max_step_completed_5(Math.max(this.max_step_completed_5, newCompleted));
+      console.log(newStep, oldStep);
+      if (newStep === 5) {
+        console.log(this.refreshMathJax);
+        console.log(this.$refs.last_step);
+        setTimeout(() => this.refreshMathJax([this.$refs.last_step.$el]), 200);
+      }
     }
   }
 };

From 6bbbb660f31ab0f2dc8a93d6edbbafc68e975f2d Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Thu, 2 Jan 2025 17:26:48 -0500
Subject: [PATCH 3/4] Increment the last step after we update the relevant
 values.

---
 .../doppler_slideshow/SlideshowDopplerCalc5.vue       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
index d8f310c28..dca95a051 100644
--- a/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
+++ b/src/hubbleds/components/doppler_slideshow/SlideshowDopplerCalc5.vue
@@ -846,10 +846,10 @@
             color="accent"
             elevation="2"
             @click="() => {
-              validateLightSpeed(['speed_light']) ? set_step(step + 1) : null;
               if (validateLightSpeed(['speed_light'])) {
                 set_student_c(parseAnswer(['speed_light']));
                 storeStudentVel(parseAnswer(['speed_light']), [lambda_obs, lambda_rest]);
+                set_step(step + 1);
               }
           }"
         >
@@ -937,14 +937,13 @@ export default {
     },
 
     removeMathJax(containers) {
-      // containers.forEach(container => container.querySelectorAll("mjx-container").forEach(el => container.remove(el)));
+      containers.forEach(container => container.querySelectorAll("mjx-container").forEach(el => container.remove(el)));
       MathJax.typesetClear(containers);
     },
 
     refreshMathJax(containers) {
       const containersToReset = containers.filter(this.containsMathJax);
       this.removeMathJax(containersToReset);
-      this.$forceUpdate();
       this.$nextTick(() => MathJax.typesetPromise(containersToReset));
     },
 
@@ -984,12 +983,6 @@ export default {
       const isInteractStep = this.interact_steps_5.includes(newStep);
       const newCompleted = isInteractStep ? newStep - 1 : newStep;
       this.set_max_step_completed_5(Math.max(this.max_step_completed_5, newCompleted));
-      console.log(newStep, oldStep);
-      if (newStep === 5) {
-        console.log(this.refreshMathJax);
-        console.log(this.$refs.last_step);
-        setTimeout(() => this.refreshMathJax([this.$refs.last_step.$el]), 200);
-      }
     }
   }
 };

From 60bc1edc625116ed30ddb39d573d42c12415457b Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Thu, 2 Jan 2025 17:27:16 -0500
Subject: [PATCH 4/4] Check if answer value is null/undefined.

---
 .../01-spectra-&-velocity/guidelines/GuidelineDopplerCalc4.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hubbleds/pages/01-spectra-&-velocity/guidelines/GuidelineDopplerCalc4.vue b/src/hubbleds/pages/01-spectra-&-velocity/guidelines/GuidelineDopplerCalc4.vue
index 09d6d3a42..649a1080e 100644
--- a/src/hubbleds/pages/01-spectra-&-velocity/guidelines/GuidelineDopplerCalc4.vue
+++ b/src/hubbleds/pages/01-spectra-&-velocity/guidelines/GuidelineDopplerCalc4.vue
@@ -198,7 +198,7 @@ export default {
         const value = this.parseAnswer(id);
         console.log(id, index, value, expectedAnswers[index], value && value === expectedAnswers[index]);
         // this.failed_validation_4_callback((!(value && value === expectedAnswers[index])));
-        return value && value === expectedAnswers[index];
+        return value != null && value === expectedAnswers[index];
       });
     }
   },