From d1dda71c0aef892eb55f6b9c19f9997f076b184c Mon Sep 17 00:00:00 2001 From: Josh Foster Date: Sat, 26 Nov 2016 21:24:27 -0600 Subject: [PATCH 1/2] completed basic timer --- timers.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/timers.js b/timers.js index fd40910..de54e1e 100644 --- a/timers.js +++ b/timers.js @@ -1,4 +1,55 @@ +var time = 0; +addTime = function(){ + time = time+1; + $('#timer').html(time); + return time; +} +resetTime = function(intervalTime){ + clearInterval(intervalTime); + time = 0; + $('#timer').html(time); +} +startTime = function(){ + var intervalTime = setInterval(addTime,1000); + $('#pause').on('click',function(){ + clearInterval(intervalTime); + }); + $('#reset').on('click',function(){ + resetTime(intervalTime); + }) +} +$('#start').on('click', startTime); + + +// var Timer = { +// +// time: 0, +// +// addTime : function(){ +// time = time+1; +// $('#timer').html(time); +// return time; +// }, +// resetTime : function(intervalTime){ +// clearInterval(intervalTime); +// this.time = 0; +// $('#timer').html(this.time); +// }, +// +// startTime : function(){ +// var intervalTime = setInterval(this.addTime,1000); +// $('#pause').on('click',function(){ +// clearInterval(this.intervalTime); +// }); +// $('#reset').on('click',function(){ +// resetTime(this.intervalTime); +// }); +// } +// +// }; +// +// $('#start').on('click', Time.startTime); From 9a1fbd9dd0a1a3ba52eae0c82b283a8518a41391 Mon Sep 17 00:00:00 2001 From: Josh Foster Date: Sun, 27 Nov 2016 22:28:59 -0600 Subject: [PATCH 2/2] finished timer but not as a timer object --- timers.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/timers.js b/timers.js index de54e1e..e13ae4e 100644 --- a/timers.js +++ b/timers.js @@ -24,10 +24,11 @@ startTime = function(){ $('#start').on('click', startTime); +//================================ // var Timer = { // -// time: 0, +// time : 0, // // addTime : function(){ // time = time+1; @@ -36,20 +37,20 @@ $('#start').on('click', startTime); // }, // resetTime : function(intervalTime){ // clearInterval(intervalTime); -// this.time = 0; -// $('#timer').html(this.time); +// time = 0; +// $('#timer').html(time); // }, // // startTime : function(){ // var intervalTime = setInterval(this.addTime,1000); // $('#pause').on('click',function(){ -// clearInterval(this.intervalTime); +// clearInterval(intervalTime); // }); // $('#reset').on('click',function(){ -// resetTime(this.intervalTime); -// }); -// } +// resetTime(intervalTime); +// }) +// }, // // }; // -// $('#start').on('click', Time.startTime); +// $('#start').on('click', Timer.startTime);