fix 403 Network Error handling

metafizzy · Jan 3, 2021 · 370f786 · 370f786
1 parent 5cfdedf
commit 370f786
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/dist/infinite-scroll.pkgd.js b/dist/infinite-scroll.pkgd.js
@@ -1,5 +1,5 @@
 /*!
- * Infinite Scroll PACKAGED v4.0.0
+ * Infinite Scroll PACKAGED v4.0.1
  * Automatically add next page
  *
  * Licensed GPLv3 for open source use
@@ -844,26 +844,30 @@ proto.loadNextPage = function() {
   this.isLoading = true;
   if ( typeof fetchOptions == 'function' ) fetchOptions = fetchOptions();
 
-  let fetchPromise = fetch( path, fetchOptions ).then( ( response ) => {
-    if ( !response.ok ) {
-      let error = new Error( response.statusText );
-      this.onPageError( error, path, response );
-      return { response };
-    }
-
-    return response[ responseBody ]().then( ( body ) => {
-      let canDomParse = responseBody == 'text' && domParseResponse;
-      if ( canDomParse ) {
-        body = domParser.parseFromString( body, 'text/html' );
-      }
-      if ( response.status == 204 ) {
-        this.lastPageReached( body, path );
-        return { body, response };
-      } else {
-        return this.onPageLoad( body, path, response );
+  let fetchPromise = fetch( path, fetchOptions )
+    .then( ( response ) => {
+      if ( !response.ok ) {
+        let error = new Error( response.statusText );
+        this.onPageError( error, path, response );
+        return { response };
       }
+
+      return response[ responseBody ]().then( ( body ) => {
+        let canDomParse = responseBody == 'text' && domParseResponse;
+        if ( canDomParse ) {
+          body = domParser.parseFromString( body, 'text/html' );
+        }
+        if ( response.status == 204 ) {
+          this.lastPageReached( body, path );
+          return { body, response };
+        } else {
+          return this.onPageLoad( body, path, response );
+        }
+      } );
+    } )
+    .catch( ( error ) => {
+      this.onPageError( error, path );
     } );
-  } );
 
   this.dispatchEvent( 'request', null, [ path, fetchPromise ] );
 

diff --git a/dist/infinite-scroll.pkgd.min.js b/dist/infinite-scroll.pkgd.min.js
diff --git a/js/index.js b/js/index.js
@@ -1,5 +1,5 @@
 /*!
- * Infinite Scroll v4.0.0
+ * Infinite Scroll v4.0.1
  * Automatically add next page
  *
  * Licensed GPLv3 for open source use

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "infinite-scroll",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Automatically add next page",
   "main": "js/index.js",
   "files": [