Move continuous setting out of global .waypoints.settings and into individual waypoint options

Author: imakewebthings

test/spec.js

@@ -244,6 +244,75 @@ describe('jQuery Waypoints', function() {
 				expect($.waypoints().length).toBeFalsy();
 			});
 		});
+		
+		it('should trigger if continuous is true and waypoint is not last', function() {
+			var $f = $('#near1'),
+			$g = $('#near2'),
+			hitcount = 0;
+			
+			spyOnEvent($f, 'waypoint.reached');
+			
+			runs(function() {
+				$e.add($f).add($g).waypoint(function() {
+					hitcount++;
+				});
+				$se.scrollTop($g.offset().top);
+			});
+			
+			waits(standardWait);
+			
+			runs(function() {
+				expect(hitcount).toEqual(3);
+			});
+		});
+		
+		it('should not trigger if continuous is false and waypoint is not last', function() {
+			var $f = $('#near1'),
+			$g = $('#near2'),
+			hitcount = 0;
+			
+			spyOnEvent($f, 'waypoint.reached');
+			
+			runs(function() {
+				$e.add($f).add($g).waypoint(function() {
+					hitcount++;
+				});
+				$f.waypoint({
+					continuous: false
+				});
+				$se.scrollTop($g.offset().top);
+			});
+			
+			waits(standardWait);
+			
+			runs(function() {
+				expect(hitcount).toEqual(2);
+			});
+		});
+		
+		it('should trigger if continuous is false but the waypoint is last', function() {
+			var $f = $('#near1'),
+			$g = $('#near2'),
+			hitcount = 0;
+			
+			spyOnEvent($f, 'waypoint.reached');
+			
+			runs(function() {
+				$e.add($f).add($g).waypoint(function() {
+					hitcount++;
+				});
+				$g.waypoint({
+					continuous: false
+				});
+				$se.scrollTop($g.offset().top);
+			});
+			
+			waits(standardWait);
+			
+			runs(function() {
+				expect(hitcount).toEqual(3);
+			});
+		});
 	});
 
 	describe('.waypoint(callback, options)', function() {
@@ -460,59 +529,6 @@ describe('jQuery Waypoints', function() {
 			});
 		});
 
-		it('should fire all when continuous is true', function() {
-			runs(function() {
-				$se.scrollTop($('#near2').offset().top);
-			});
-			
-			waits(standardWait);
-			
-			runs(function() {
-				expect(count).toEqual(4);
-			});
-		});
-		
-		it('should fire only the last if continuous is false', function() {
-			runs(function() {
-				$.waypoints.settings.continuous = false;
-				$se.scrollTop($('#near2').offset().top);
-			});
-			
-			waits(standardWait);
-			
-			runs(function() {
-				expect(count).toEqual(1);
-				expect(curID).toEqual("near2");
-				$.waypoints.settings.continuous = true;
-			});
-		});
-		
-		it('should fire the top element in the up direction', function() {
-			var points;
-			
-			runs(function() {
-				$.waypoints.settings.continuous = false;
-				points = $.waypoints();
-				points.waypoint('remove');
-				$se.scrollTop($('#near2').offset().top + 1);
-			});
-			
-			waits(standardWait);
-			
-			runs(function() {
-				points.waypoint();
-				$se.scrollTop($('#same1').offset().top - 1);
-			});
-			
-			waits(standardWait);
-			
-			runs(function() {
-				expect(count).toEqual(1);
-				expect(curID).toEqual("same1");
-				$.waypoints.settings.continuous = true;
-			});
-		});
-		
 		it('should throttle the scroll check', function() {
 			runs(function() {
 				$se.scrollTop($('#same1').offset().top);

waypoints.js

@@ -231,7 +231,8 @@ Support:
 			return isDown ?
 				(el.offset > oldScroll && el.offset <= newScroll) :
 				(el.offset <= oldScroll && el.offset > newScroll);
-		});
+		}),
+		len = pointsHit.length;
 
 		// iOS adjustment
 		if (!oldScroll || !newScroll) {
@@ -242,21 +243,21 @@ Support:
 		oldScroll = newScroll;
 
 		// No waypoints crossed? Eject.
-		if (!pointsHit.length) return;
+		if (!len) return;
+		
+		// If several waypoints triggered, need to do so in reverse order going up
+		if (!isDown) pointsHit.reverse();
 
 		/*
-		One scroll move may cross several waypoints.  If the continuous setting is
-		true, every waypoint event should fire.  If false, only the last one.
+		One scroll move may cross several waypoints.  If the waypoint's continuous
+		option is true it should fire even if it isn't the last waypoint.  If false,
+		it will only fire if it's the last one.
 		*/
-		if ($[wps].settings.continuous) {
-			$.each(isDown ? pointsHit : pointsHit.reverse(), function(i, point) {
+		$.each(pointsHit, function(i, point) {
+			if (point.options.continuous || i === len - 1) {
 				triggerWaypoint(point, [isDown ? 'down' : 'up']);
-			});
-		}
-		else {
-			triggerWaypoint(pointsHit[isDown ? pointsHit.length - 1 : 0],
-				[isDown ? 'down' : 'up']);
-		}
+			}
+		});
 	}
 
 
@@ -275,7 +276,7 @@ Support:
 			return methods.init.apply(this, [null, method]);
 		}
 		else {
-			$.error( 'Method ' +  method + ' does not exist on jQuery' + wp );
+			$.error( 'Method ' +  method + ' does not exist on jQuery ' + wp );
 		}
 	};
 
@@ -296,6 +297,13 @@ Support:
 		boolean
 		default: false
 		If true, the waypoint will be destroyed when triggered.
+		
+	continuous
+		boolean
+		default: true
+		If true, and multiple waypoints are triggered in one scroll, this waypoint will
+		trigger even if it is not the last waypoint reached.  If false, it will only
+		trigger if it is the last waypoint.
 	
 	An offset of 250 would trigger the waypoint when the top of the element is 250px
 	from the top of the viewport. Negative values for any offset work as you might
@@ -331,6 +339,7 @@ Support:
 	want to record an event once for each page visit.
 	*/
 	$.fn[wp].defaults = {
+		continuous: true,
 		offset: 0,
 		triggerOnce: false
 	};
@@ -450,14 +459,6 @@ Support:
 	$.waypoints.settings
 	
 	Settings object that determines some of the plugin’s behavior.
-
-	continuous
-		boolean
-		default: true
-		Determines which waypoints to trigger events for if a single scroll change
-		passes more than one waypoint. If false, only the last waypoint is triggered
-		and the rest are ignored. If true, all waypoints between the previous scroll
-		position and the new one are triggered in order.
 		
 	resizeThrottle
 		number
@@ -478,7 +479,6 @@ Support:
 		http://benalman.com/projects/jquery-throttle-debounce-plugin/
 	*/
 	$[wps].settings = {
-		continuous: true,
 		resizeThrottle: 200,
 		scrollThrottle: 100
 	};