Merge pull request #310 from fieg/fix-none-left-single-page

fieg · web-flow · commit 4ea72baf8d97 · 2018-03-21T09:40:14.000+01:00
Fire noneLeft on single page scenario
diff --git a/src/jquery-ias.js b/src/jquery-ias.js
@@ -388,8 +388,12 @@
 
     this.nextUrl = this.getNextUrl();
 
+    if (!this.nextUrl) {
+      this.fire('noneLeft', [this.getLastItem()]);
+    }
+
     // start loading next page if content is shorter than page fold
-    if (currentScrollOffset >= scrollThreshold) {
+    if (this.nextUrl && currentScrollOffset >= scrollThreshold) {
       this.next();
 
       // flag as initialized when rendering is completed
@@ -495,8 +499,14 @@
 
     // ready is already fired, before on() could even be called, so
     // let's call the callback right away
-    if (event === 'ready' && this.isInitialized) {
-      $.proxy(callback, this)();
+    if (this.isInitialized) {
+      if (event === 'ready') {
+        $.proxy(callback, this)();
+      }
+      // same applies to noneLeft
+      else if (event === 'noneLeft' && !this.nextUrl) {
+        $.proxy(callback, this)();
+      }
     }
 
     return this;
@@ -567,7 +577,6 @@
 
           if (!self.nextUrl) {
             self.fire('noneLeft', [self.getLastItem()]);
-            self.listeners['noneLeft'].disable(); // disable it so it only fires once
           }
 
           self.resume();
diff --git a/test/02-listeners-test.js b/test/02-listeners-test.js
@@ -171,6 +171,8 @@ describe("IAS", function () {
         // register listener
         .on('noneLeft', spy1);
 
+    expect(spy1).not.toHaveBeenCalled();
+
     // scroll to page 2
     scrollDown().then(function() {
       wait(2000).then(function() {
@@ -189,4 +191,62 @@ describe("IAS", function () {
 
     return deferred.promise;
   });
+
+  it("should call noneLeft listeners when content is short without next (before init)", function() {
+    var deferred = when.defer();
+    var spy1 = this.spy();
+
+    jQuery.ias('destroy');
+
+    loadFixture("short-without-next.html", function() {
+      var ias = jQuery.ias({
+        container : '.listing',
+        item: '.post',
+        pagination: '.navigation',
+        next: '.next-posts a',
+        initialize: false
+      });
+
+      // register listener
+      ias.on('noneLeft', spy1);
+
+      expect(spy1).not.toHaveBeenCalled();
+
+      ias.initialize();
+
+      expect(spy1).toHaveBeenCalledOnce();
+
+      deferred.resolve();
+    });
+
+    return deferred.promise;
+  });
+
+  it("should call noneLeft listeners when content is short without next (after init)", function() {
+    var deferred = when.defer();
+    var spy1 = this.spy();
+
+    jQuery.ias('destroy');
+
+    loadFixture("short-without-next.html", function() {
+      var ias = jQuery.ias({
+        container : '.listing',
+        item: '.post',
+        pagination: '.navigation',
+        next: '.next-posts a',
+        initialize: false
+      });
+
+      ias.initialize();
+
+      // register listener
+      ias.on('noneLeft', spy1);
+
+      expect(spy1).toHaveBeenCalledOnce();
+
+      deferred.resolve();
+    });
+
+    return deferred.promise;
+  });
 });
diff --git a/test/buster.js b/test/buster.js
@@ -32,6 +32,7 @@ config["My tests"] = {
     { path: "/page3.html",  file: "test/fixtures/page3.html" },
     { path: "/framed.html", file: "test/fixtures/framed.html" },
     { path: "/short.html",  file: "test/fixtures/short.html" },
+    { path: "/short-without-next.html",  file: "test/fixtures/short-without-next.html" },
     { path: "/ajax1.html",   file: "test/fixtures/ajax1.html" },
     { path: "/ajax2.html",   file: "test/fixtures/ajax2.html" },
     { path: "/multiple1.html",   file: "test/fixtures/multiple1.html" },
diff --git a/test/fixtures/short-without-next.html b/test/fixtures/short-without-next.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Very short Page 1</title>
+</head>
+<body>
+<div id="content">
+    <div class="listing">
+        <div class="post">
+            <strong>item 1</strong>
+            <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
+        </div>
+
+        <div class="post">
+            <strong>item 2</strong>
+            <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis.</p>
+        </div>
+    </div>
+
+    <div class="navigation">
+        <ul>
+            <li>1</li>
+        </ul>
+    </div>
+</div>
+
+</body>
+</html>
