handle provisional load failures

brave · May 27, 2016 · 1bbc469 · 1bbc469
1 parent 9290ee8
commit 1bbc469
Showing 1 changed file with 33 additions and 25 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -441,6 +441,33 @@ class Frame extends ImmutableComponent {
         this.webview.executeJavaScript(hack.pageLoadEndScript)
       }
     }
+    const loadFail = (e) => {
+      if (isFrameError(e.errorCode)) {
+        // temporary workaround for https://github.com/brave/browser-laptop/issues/1817
+        if (e.validatedURL === aboutUrls.get('about:newtab') ||
+            e.validatedURL === aboutUrls.get('about:blank') ||
+            e.validatedURL === aboutUrls.get('about:certerror') ||
+            e.validatedURL === aboutUrls.get('about:error') ||
+            e.validatedURL === aboutUrls.get('about:safebrowsing')) {
+          // this will just display a blank page for errors
+          // but we don't want to take the user out of the private tab
+          return
+        } else if (isTargetAboutUrl(e.validatedURL)) {
+          // open a new tab for other about urls
+          // and send this tab back to wherever it came from
+          this.goBack()
+          windowActions.newFrame({location: e.validatedURL}, true)
+          return
+        }
+
+        windowActions.setFrameError(this.props.frame, {
+          event_type: 'did-fail-load',
+          errorCode: e.errorCode,
+          url: e.validatedURL
+        })
+        windowActions.loadUrl(this.props.frame, 'about:error')
+      }
+    }
     this.webview.addEventListener('load-commit', (e) => {
       loadStart(e)
     })
@@ -466,34 +493,15 @@ class Frame extends ImmutableComponent {
       windowActions.loadUrl(this.props.frame, 'about:error')
       this.webview = false
     })
+    this.webview.addEventListener('did-fail-provisional-load', (e) => {
+      if (e.isMainFrame) {
+        loadFail(e)
+      }
+    })
     this.webview.addEventListener('did-fail-load', (e) => {
       if (e.isMainFrame) {
         loadEnd()
-        if (isFrameError(e.errorCode)) {
-          // temporary workaround for https://github.com/brave/browser-laptop/issues/1817
-          if (e.validatedURL === aboutUrls.get('about:newtab') ||
-              e.validatedURL === aboutUrls.get('about:blank') ||
-              e.validatedURL === aboutUrls.get('about:certerror') ||
-              e.validatedURL === aboutUrls.get('about:error') ||
-              e.validatedURL === aboutUrls.get('about:safebrowsing')) {
-            // this will just display a blank page for errors
-            // but we don't want to take the user out of the private tab
-            return
-          } else if (isTargetAboutUrl(e.validatedURL)) {
-            // open a new tab for other about urls
-            // and send this tab back to wherever it came from
-            this.goBack()
-            windowActions.newFrame({location: e.validatedURL}, true)
-            return
-          }
-
-          windowActions.setFrameError(this.props.frame, {
-            event_type: 'did-fail-load',
-            errorCode: e.errorCode,
-            url: e.validatedURL
-          })
-          windowActions.loadUrl(this.props.frame, 'about:error')
-        }
+        loadFail(e)
       }
     })
     this.webview.addEventListener('did-finish-load', () => {