👷 build v3.0.6

metafizzy · Apr 27, 2019 · 7270f45 · 7270f45
1 parent 9f9ccf3
commit 7270f45
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/dist/infinite-scroll.pkgd.js b/dist/infinite-scroll.pkgd.js
@@ -1,5 +1,5 @@
 /*!
- * Infinite Scroll PACKAGED v3.0.5
+ * Infinite Scroll PACKAGED v3.0.6
  * Automatically add next page
  *
  * Licensed GPLv3 for open source use
@@ -797,9 +797,13 @@ proto.updateGetPathTemplate = function( optPath ) {
   }.bind( this );
   // get pageIndex from location
   // convert path option into regex to look for pattern in location
-  var regexString = optPath.replace( '{{#}}', '(\\d\\d?\\d?)' );
+  // escape query (?) in url, allows for parsing GET parameters 
+  var regexString = optPath
+    .replace( /(\\\?|\?)/, '\\?' )
+    .replace( '{{#}}', '(\\d\\d?\\d?)' );
   var templateRe = new RegExp( regexString );
   var match = location.href.match( templateRe );
+
   if ( match ) {
     this.pageIndex = parseInt( match[1], 10 );
     this.log( 'pageIndex', [ this.pageIndex, 'template string' ] );
@@ -859,9 +863,17 @@ proto.updateGetAbsolutePath = function() {
   }
 
   var pathname = location.pathname;
+  // query parameter #829. example.com/?pg=2
+  var isQuery = path.match( /^\?/ );
+  if ( isQuery ) {
+    this.getAbsolutePath = function() {
+      return pathname + this.getPath();
+    };
+    return;
+  }
+
   // /foo/bar/index.html => /foo/bar
   var directory = pathname.substring( 0, pathname.lastIndexOf('/') );
-
   this.getAbsolutePath = function() {
     return directory + '/' + this.getPath();
   };
@@ -1021,7 +1033,11 @@ proto.loadNextPage = function() {
     this.onPageError( error, path );
   }.bind( this );
 
-  request( path, this.options.responseType, onLoad, onError );
+  var onLast = function( response ) {
+    this.lastPageReached( response, path );
+  }.bind( this );
+
+  request( path, this.options.responseType, onLoad, onError, onLast );
   this.dispatchEvent( 'request', null, [ path ] );
 };
 
@@ -1219,7 +1235,7 @@ proto.stopPrefill = function() {
 
 // -------------------------- request -------------------------- //
 
-function request( url, responseType, onLoad, onError ) {
+function request( url, responseType, onLoad, onError, onLast ) {
   var req = new XMLHttpRequest();
   req.open( 'GET', url, true );
   // set responseType document to return DOM
@@ -1231,6 +1247,8 @@ function request( url, responseType, onLoad, onError ) {
   req.onload = function() {
     if ( req.status == 200 ) {
       onLoad( req.response );
+    } else if ( req.status == 204 ) {
+      onLast( req.response );
     } else {
       // not 200 OK, error
       var error = new Error( req.statusText );
@@ -1785,7 +1803,7 @@ return InfiniteScroll;
 }));
 
 /*!
- * Infinite Scroll v3.0.5
+ * Infinite Scroll v3.0.6
  * Automatically add next page
  *
  * Licensed GPLv3 for open source use