Merge pull request #308 from fieg/timing-noneleft-event

Tweaked when noneLeft event is fired

Author: fieg

src/jquery-ias.js

@@ -552,24 +552,24 @@
     var url = this.nextUrl,
         self = this;
 
-    this.pause();
-
     if (!url) {
-      this.fire('noneLeft', [this.getLastItem()]);
-      this.listeners['noneLeft'].disable(); // disable it so it only fires once
-
-      self.resume();
-
       return false;
     }
 
+    this.pause();
+
     var promise = this.fire('next', [url]);
 
     promise.done(function() {
       self.load(url, function(data, items) {
         self.render(items, function() {
           self.nextUrl = self.getNextUrl(data);
 
+          if (!self.nextUrl) {
+            self.fire('noneLeft', [self.getLastItem()]);
+            self.listeners['noneLeft'].disable(); // disable it so it only fires once
+          }
+
           self.resume();
         });
       });

test/02-listeners-test.js

@@ -179,16 +179,9 @@ describe("IAS", function () {
         // scroll to page 3
         scrollDown().then(function() {
           wait(1500).then(function() {
-            expect(spy1).not.toHaveBeenCalled();
+            expect(spy1).toHaveBeenCalledOnce();
 
-            // now on the final page, scroll down, and expect to have been called
-            scrollDown().then(function() {
-              wait(1500).then(function() {
-                expect(spy1).toHaveBeenCalledOnce();
-
-                deferred.resolve();
-              });
-            });
+            deferred.resolve();
           });
         });
       });