Fix Firefox iframe about:blank after load braindeath

2019-10-02 15:58:38 +02:00
1 changed files with 8 additions and 6 deletions
@@ -141,13 +141,15 @@ export class DashboardComponent implements OnInit, OnDestroy {

  iframeLoad() {
    if (this.webiframe && this.iframeUrl.value) {
-      // This hack deals with Firefox iframes having a valid src,
-      // but 'about:blank' contentWindow on (load) events
-      setTimeout(() => {
-        const href = this.webiframe.nativeElement.contentWindow.frames.location.href;
-        const niceURL = href.match(/.*?\/\/.*?(\/.*)/)[1];
+      const href = this.webiframe.nativeElement.contentWindow.frames.location.href;
+      console.log(href, this.webiframe.nativeElement.contentWindow);
+      const match = href.match(/.*?\/\/.*?(\/.*)/);
+      if (match !== null) {
+        // iframes on Firefox can have an about:blank
+        // contentWindow after firing a (load) event
+        const niceURL = match[1];
        this.actualIframeUrl = niceURL;
-      }, 0);
+      }
    }
  }