added getDuration and executeAfterWait attribute

Author: SeverinDK

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "moment-timer",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"description": "A moment.js plugin for timers setInterval & setTimeout.",
 	"main": "lib/moment-timer.js",
 	"repository": {
@@ -25,4 +25,4 @@
 	"bugs": {
 		"url": "https://github.com/SeverinDK/moment-timer/issues"
 	}
-}
+}

example/index.html

@@ -55,20 +55,15 @@ <h1>Example of Interval.</h1>
 			var intervalContainer = document.getElementById("interval");
 			var startTick = new Date().getTime();
 			var interval = moment.duration(1, "seconds").timer({
-					loop: true
+					loop: true,
+					wait: 2500,
+					executeAfterWait: true
 				}, 
 				function() { 
 					intervalContainer.innerHTML += "Callback fired " 
 					+ (new Date().getTime() - startTick) 
 					+ "ms after script was started.<br>"; 
 				});
-
-			moment.duration(1500).timer({loop: false}, function() {
-				interval.stop();
-				moment.duration(1500).timer(function() {
-					interval.start();
-				});
-			});
 		</script>
 	</div>
 </body>

lib/moment-timer.js

@@ -1,35 +1,38 @@
-(function(root, undefined) {
+(function () {
 
-    function Timer(duration, loop, wait, start, callback) {
+    function Timer(duration, attributes, callback) {
         this.timerDuration = duration;
         this.callback = callback;
-        this.loop = loop;
+        this.loop = attributes.loop;
         this.started = false;
         this.stopped = false;       // If stop() is called this variable will be used to finish the paused duration once it's started again.
         this.timer;
         this.startTick;
         this.endTick; 
 
-        if(start) {
-            if(wait > 0) {
+        if (attributes.start) {
+            if (attributes.wait > 0) {
                 var self = this;
-                setTimeout(function() {
+                setTimeout(function () {
+                    if (attributes.executeAfterWait) {
+                        callback();
+                    }
                     self.start();
-                }, wait);
+                }, attributes.wait);
             } else {
                 this.start();
             }
         }
     }
 
-    Timer.prototype.start = function() {
-        if(!this.started) {
+    Timer.prototype.start = function () {
+        if (!this.started) {
 
             var self = this;
 
             // Takes care of restarts. If the timer has been stopped, this will make sure the leftover duration is executed.
-            if(this.stopped) {
-                setTimeout(function() {
+            if (this.stopped) {
+                setTimeout(function () {
                     self.callback();
                     return self.start();
                 }, this.getRemainingDuration());
@@ -38,13 +41,13 @@
                 return true;
             }
 
-            if(this.loop) {
-                this.timer = setInterval(function(){
+            if (this.loop) {
+                this.timer = setInterval(function () {
                     self.updateStartEndTickFromDuration(self.timerDuration);
                     return self.callback();
                 }, this.timerDuration);
             } else {
-                this.timer = setTimeout(function(){
+                this.timer = setTimeout(function () {
                     self.started = false;
                     return self.callback();
                 }, this.timerDuration);
@@ -59,8 +62,8 @@
         return false;
     }
 
-    Timer.prototype.stop = function() {
-        if(this.started) {
+    Timer.prototype.stop = function () {
+        if (this.started) {
             this.clearTimer();
             this.updateStartEndTickFromDuration(this.getRemainingDuration());
             this.started = false;
@@ -71,9 +74,9 @@
         return false;
     }
 
-    Timer.prototype.clearTimer = function() {
-        if(this.timer) {
-            if(this.loop) {
+    Timer.prototype.clearTimer = function () {
+        if (this.timer) {
+            if (this.loop) {
                 this.timer = clearInterval(this.timer);
             } else {
                 this.timer = clearTimeout(this.timer);
@@ -85,15 +88,15 @@
         return false;
     }
 
-    Timer.prototype.updateStartEndTickFromDuration = function(duration) {
+    Timer.prototype.updateStartEndTickFromDuration = function (duration) {
         this.startTick = Date.now();
         this.endTick = this.startTick + duration;
 
         return true;
     }
 
-    Timer.prototype.duration = function() {
-        if(arguments.length > 0) {
+    Timer.prototype.duration = function () {
+        if (arguments.length > 0) {
             this.timerDuration = moment.duration(arguments[0], arguments[1]).asMilliseconds();
             this.stop();
             this.start();
@@ -103,9 +106,13 @@
         return false;
     }
 
-    Timer.prototype.getRemainingDuration = function() {
-        if(this.startTick && this.endTick) {
-            if(this.stopped) {
+    Timer.prototype.getDuration = function () {
+        return this.timerDuration;
+    }
+
+    Timer.prototype.getRemainingDuration = function () {
+        if (this.startTick && this.endTick) {
+            if (this.stopped) {
                 return this.endTick - this.startTick;
             } else {
                 return this.endTick - Date.now();
@@ -115,10 +122,10 @@
         return 0;
     }
 
-    Timer.prototype.isStopped = function() {
+    Timer.prototype.isStopped = function () {
         return this.stopped;
     }
-
+    
     // define internal moment reference
     var moment;
 
@@ -135,23 +142,23 @@
         throw "Moment Timer cannot find Moment.js";
     }
 
-    moment.duration.fn.timer = function(attributes, callback) {
-        if(typeof attributes === "function") {
+    moment.duration.fn.timer = function (attributes, callback) {
+        if (typeof attributes === "function") {
             callback = attributes;
             attributes = {
                 wait: 0,
                 loop: false,
                 start: true
             };
-        } else if(typeof attributes === "object" && typeof callback === "function") {
-            if(attributes.start == null) {
+        } else if (typeof attributes === "object" && typeof callback === "function") {
+            if (attributes.start == null) {
                 attributes.start = true;
             }
         } else {
             throw new Error("First argument must be of type function or object.");
         }
 
-        return new Timer(this.asMilliseconds(), attributes.loop, attributes.wait, attributes.start, callback);
+        return new Timer(this.asMilliseconds(), attributes, callback);
     };
 
 })(this);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "moment-timer",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"description": "A moment.js plugin for timers setInterval & setTimeout.",
 	"main": "lib/moment-timer.js",
 	"repository": {