Merge pull request walmik#35 from walmik/develop

walmik · walmik · commit 9b0c11d3fc19 · 2015-03-17T05:24:44.000-07:00
Fixed countdown and enabled test
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
diff --git a/src/timer.jquery.js b/src/timer.jquery.js
@@ -63,6 +63,11 @@
 			if (options.repeat) {
 				duration += options.duration;
 			}
+
+			// If this is a countdown, then end it as duration has completed
+			if (options.countdown) {
+				options.countdown = false;
+			}
 		}
 	}
 
diff --git a/test/timer.jquery.test.js b/test/timer.jquery.test.js
@@ -4,7 +4,7 @@
 		scenarios = [],
 		count = 0;	// To print 'Done! on completion of tests
 
-	/*test('timer supports countdown', function() {
+	test('timer supports countdown', function() {
 		$('#timer').timer({
 			duration: '3s',
 			countdown: true,
@@ -23,7 +23,7 @@
 
 			start();
 		}, 3500);
-	});*/
+	});
 
 	// Timer resets to 0 seconds if reset was called
 	test('timer resets to 0 seconds if reset was called', function() {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@`
`63`	`63`	`if (options.repeat) {`
`64`	`64`	`duration += options.duration;`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ // If this is a countdown, then end it as duration has completed`
	`68`	`+ if (options.countdown) {`
	`69`	`+ options.countdown = false;`
	`70`	`+ }`
`66`	`71`	`}`
`67`	`72`	`}`
`68`	`73`