Fix window null on connection error. Closes #2716

phoenixframework · Sep 19, 2023 · 633f356 · 633f356
1 parent 14a0355
commit 633f356
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 13 deletions.
diff --git a/assets/js/phoenix_live_view/view.js b/assets/js/phoenix_live_view/view.js
@@ -656,10 +656,12 @@ export default class View {
   onJoinError(resp){
     if(resp.reason === "reload"){
       this.log("error", () => [`failed mount with ${resp.status}. Falling back to page request`, resp])
-      return this.onRedirect({to: this.href})
+      if(this.isMain()){ this.onRedirect({to: this.href}) }
+      return
     } else if(resp.reason === "unauthorized" || resp.reason === "stale"){
       this.log("error", () => ["unauthorized live_redirect. Falling back to page request", resp])
-      return this.onRedirect({to: this.href})
+      if(this.isMain()){ this.onRedirect({to: this.href}) }
+      return
     }
     if(resp.redirect || resp.live_redirect){
       this.joinPending = false

diff --git a/priv/static/phoenix_live_view.cjs.js b/priv/static/phoenix_live_view.cjs.js
diff --git a/priv/static/phoenix_live_view.cjs.js.map b/priv/static/phoenix_live_view.cjs.js.map
diff --git a/priv/static/phoenix_live_view.esm.js b/priv/static/phoenix_live_view.esm.js
diff --git a/priv/static/phoenix_live_view.esm.js.map b/priv/static/phoenix_live_view.esm.js.map
diff --git a/priv/static/phoenix_live_view.js b/priv/static/phoenix_live_view.js
@@ -3166,10 +3166,16 @@ within:
     onJoinError(resp) {
       if (resp.reason === "reload") {
         this.log("error", () => [`failed mount with ${resp.status}. Falling back to page request`, resp]);
-        return this.onRedirect({ to: this.href });
+        if (this.isMain()) {
+          this.onRedirect({ to: this.href });
+        }
+        return;
       } else if (resp.reason === "unauthorized" || resp.reason === "stale") {
         this.log("error", () => ["unauthorized live_redirect. Falling back to page request", resp]);
-        return this.onRedirect({ to: this.href });
+        if (this.isMain()) {
+          this.onRedirect({ to: this.href });
+        }
+        return;
       }
       if (resp.redirect || resp.live_redirect) {
         this.joinPending = false;

diff --git a/priv/static/phoenix_live_view.min.js b/priv/static/phoenix_live_view.min.js