From 1650c3baf51b85912767ddc0ccd20abdc809fbff Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Wed, 22 Mar 2017 05:13:48 -0700
Subject: [PATCH 01/15] Update README.md
---
README.md | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 21c1b16..b1da1ae 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,22 @@
## Getting started
+Load the plugin in a script tag (right after loading jQuery) directly from CDNjs to get the current version of the timer plugin,
+
+```html
+
+
+```
+
If you are using bower,
```bash
bower install timer.jquery
```
-Alternatively you can [download][min] the jQuery timer plugin. Then, in your web page:
+Alternatively you can [download][min] the jQuery timer plugin and host it relative to your HTML file. Then, in your web page:
```html
-
+
-
+https://cdnjs.cloudflare.com/ajax/libs/timer.jquery/0.6.5/timer.jquery.min.js
```
If you are using bower,
@@ -25,7 +24,7 @@ If you are using bower,
bower install timer.jquery
```
-Alternatively you can [download][min] the jQuery timer plugin and host it relative to your HTML file. Then, in your web page:
+Alternatively you can [download][min] the jQuery timer plugin and host it relative to your HTML file. Once you have your preferred way to get jquery and the timer plugin, in your web page:
```html
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index 6d87de8..3202055 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -124,14 +124,12 @@
* Timer class to be instantiated on every element.
* All relative values will be stored at instance level.
*/
-
var Timer = function () {
/**
* Construct a Timer instance on the provided element with the given config.
* @param {Object} element HTML node as passed by jQuery
* @param {Object|String} config User extended options or a string (start, pause, resume etc)
*/
-
function Timer(element, config) {
_classCallCheck(this, Timer);
@@ -262,10 +260,7 @@
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
- DAYINSECONDS: 86400,
- THIRTYSIXHUNDRED: 3600,
- SIXTY: 60,
- TEN: 10
+ DAYINSECONDS: 86400
};
exports.default = Constants;
@@ -294,29 +289,17 @@
* @return {Object} Object with days, hours, minutes, totalMinutes, seconds and totalSeconds
*/
var _secondsToTimeObj = function _secondsToTimeObj() {
- var totalSeconds = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0];
-
- var days = 0;
- var hours = 0;
- var totalMinutes = Math.floor(totalSeconds / _constants2.default.SIXTY);
- var minutes = totalMinutes;
- var seconds = void 0;
-
- if (totalSeconds >= _constants2.default.DAYINSECONDS) {
- days = Math.floor(totalSeconds / _constants2.default.DAYINSECONDS);
- }
-
- if (totalSeconds >= _constants2.default.THIRTYSIXHUNDRED) {
- hours = Math.floor(totalSeconds % _constants2.default.DAYINSECONDS / _constants2.default.THIRTYSIXHUNDRED);
- }
-
- if (totalSeconds >= _constants2.default.SIXTY) {
- minutes = Math.floor(totalSeconds % _constants2.default.THIRTYSIXHUNDRED / _constants2.default.SIXTY);
- }
+ var totalSeconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
- seconds = totalSeconds % _constants2.default.SIXTY;
-
- return { days: days, hours: hours, minutes: minutes, totalMinutes: totalMinutes, seconds: seconds, totalSeconds: totalSeconds };
+ var totalMinutes = Math.floor(totalSeconds / 60);
+ return {
+ days: totalSeconds >= _constants2.default.DAYINSECONDS ? Math.floor(totalSeconds / _constants2.default.DAYINSECONDS) : 0,
+ hours: totalSeconds >= 3600 ? Math.floor(totalSeconds % _constants2.default.DAYINSECONDS / 3600) : 0,
+ totalMinutes: totalMinutes,
+ minutes: totalSeconds >= 60 ? Math.floor(totalSeconds % 3600 / 60) : totalMinutes,
+ seconds: totalSeconds % 60,
+ totalSeconds: totalSeconds
+ };
};
/**
@@ -328,12 +311,13 @@
/* global $:true */
var _paddedValue = function _paddedValue(num) {
num = parseInt(num, 10);
- if (num < 10) {
- return '0' + num;
- }
- return num;
+ return (num < 10 && '0') + num;
};
+ /**
+ * Method to return the base settings that can be used in case of no or missing options
+ * @return {Object} Default config
+ */
var getDefaultConfig = function getDefaultConfig() {
return {
seconds: 0, // Default seconds value to start timer from
@@ -354,7 +338,7 @@
* @return {Number} Return seconds passed since Jan 1, 1970
*/
var unixSeconds = function unixSeconds() {
- return Math.round(Date.now() / 1000);
+ return Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
};
/**
@@ -393,9 +377,11 @@
var secondsToFormattedTime = function secondsToFormattedTime(seconds, formattedTime) {
var timeObj = _secondsToTimeObj(seconds);
var formatDef = [{ identifier: '%d', value: timeObj.days }, { identifier: '%h', value: timeObj.hours }, { identifier: '%m', value: timeObj.minutes }, { identifier: '%s', value: timeObj.seconds }, { identifier: '%g', value: timeObj.totalMinutes }, { identifier: '%t', value: timeObj.totalSeconds }, { identifier: '%D', value: _paddedValue(timeObj.days) }, { identifier: '%H', value: _paddedValue(timeObj.hours) }, { identifier: '%M', value: _paddedValue(timeObj.minutes) }, { identifier: '%S', value: _paddedValue(timeObj.seconds) }, { identifier: '%G', value: _paddedValue(timeObj.totalMinutes) }, { identifier: '%T', value: _paddedValue(timeObj.totalSeconds) }];
- formatDef.forEach(function (fmt) {
- formattedTime = formattedTime.replace(fmt.identifier, fmt.value);
- });
+
+ // Use `for` loop to support ie8 after transpilation
+ for (var i = 0; i < formatDef.length; i++) {
+ formattedTime = formattedTime.replace(formatDef[i].identifier, formatDef[i].value);
+ }
return formattedTime;
};
@@ -406,42 +392,37 @@
* @return {Number} Returns 330
*/
var durationTimeToSeconds = function durationTimeToSeconds(timeFormat) {
- if (!timeFormat) {
- throw new Error('durationTimeToSeconds expects a string argument!');
- }
-
- // Early return in case a number is passed
if (!isNaN(Number(timeFormat))) {
+ // A number was passed
return timeFormat;
}
timeFormat = timeFormat.toLowerCase();
- var days = timeFormat.match(/\d{1,2}d/); // Match 10d in 10d5h30m10s
- var hrs = timeFormat.match(/\d{1,2}h/); // Match 5h in 5h30m10s
- var mins = timeFormat.match(/\d{1,2}m/); // Match 30m in 5h30m10s
- var secs = timeFormat.match(/\d{1,2}s/); // Match 10s in 5h30m10s
+ var days = timeFormat.match(/\d+d/); // Match 10d in 10d5h30m10s
+ var hrs = timeFormat.match(/\d+h/); // Match 5h in 5h30m10s
+ var mins = timeFormat.match(/\d+m/); // Match 30m in 5h30m10s
+ var secs = timeFormat.match(/\d+s/); // Match 10s in 5h30m10s
if (!days && !hrs && !mins && !secs) {
throw new Error('Invalid string passed in durationTimeToSeconds!');
}
- var seconds = 0;
+ var seconds = 0;
if (days) {
- seconds += Number(days[0].replace('d', '') * _constants2.default.DAYINSECONDS);
+ seconds += Number(days[0].replace('d', '')) * _constants2.default.DAYINSECONDS;
}
if (hrs) {
- seconds += Number(hrs[0].replace('h', '') * _constants2.default.THIRTYSIXHUNDRED);
+ seconds += Number(hrs[0].replace('h', '')) * 3600;
}
if (mins) {
- seconds += Number(mins[0].replace('m', '')) * _constants2.default.SIXTY;
+ seconds += Number(mins[0].replace('m', '')) * 60;
}
if (secs) {
seconds += Number(secs[0].replace('s', ''));
}
-
return seconds;
};
@@ -460,13 +441,13 @@
} else if (editedTime.indexOf('min') > 0) {
editedTime = editedTime.replace(/\smin/g, '');
arr = editedTime.split(':');
- time = Number(arr[0] * _constants2.default.SIXTY) + Number(arr[1]);
+ time = Number(arr[0] * 60) + Number(arr[1]);
} else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)) {
arr = editedTime.split(':');
- time = Number(arr[0] * _constants2.default.DAYINSECONDS) + Number(arr[1] * _constants2.default.THIRTYSIXHUNDRED) + Number(arr[2] * _constants2.default.SIXTY) + Number(arr[3]);
+ time = Number(arr[0] * _constants2.default.DAYINSECONDS) + Number(arr[1] * 3600) + Number(arr[2] * 60) + Number(arr[3]);
} else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}/)) {
arr = editedTime.split(':');
- time = Number(arr[0] * _constants2.default.THIRTYSIXHUNDRED) + Number(arr[1] * _constants2.default.SIXTY) + Number(arr[2]);
+ time = Number(arr[0] * 3600) + Number(arr[1] * 60) + Number(arr[2]);
}
return time;
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index 809841d..0de479a 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-/*! timer.jquery 0.6.3 2016-08-09*/!function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}var e=c(1),f=d(e),g=c(2),h=d(g);!function(){$.fn.timer=function(a){return a=a||"start",this.each(function(){$.data(this,h["default"].PLUGIN_NAME)instanceof f["default"]||$.data(this,h["default"].PLUGIN_NAME,new f["default"](this,a));var b=$.data(this,h["default"].PLUGIN_NAME);"string"==typeof a?"function"==typeof b[a]&&b[a]():b.start()})}}()},function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}function e(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(b,"__esModule",{value:!0});var f=function(){function a(a,b){for(var c=0;c=f["default"].DAYINSECONDS&&(b=Math.floor(a/f["default"].DAYINSECONDS)),a>=f["default"].THIRTYSIXHUNDRED&&(c=Math.floor(a%f["default"].DAYINSECONDS/f["default"].THIRTYSIXHUNDRED)),a>=f["default"].SIXTY&&(e=Math.floor(a%f["default"].THIRTYSIXHUNDRED/f["default"].SIXTY)),g=a%f["default"].SIXTY,{days:b,hours:c,minutes:e,totalMinutes:d,seconds:g,totalSeconds:a}},h=function(a){return a=parseInt(a,10),a<10?"0"+a:a},i=function(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}},j=function(){return Math.round(Date.now()/1e3)},k=function(a){var b=g(a);if(b.days)return b.days+":"+h(b.hours)+":"+h(b.minutes)+":"+h(b.seconds);if(b.hours)return b.hours+":"+h(b.minutes)+":"+h(b.seconds);var c="";return c=b.minutes?b.minutes+":"+h(b.seconds)+" min":b.seconds+" sec"},l=function(a,b){var c=g(a),d=[{identifier:"%d",value:c.days},{identifier:"%h",value:c.hours},{identifier:"%m",value:c.minutes},{identifier:"%s",value:c.seconds},{identifier:"%g",value:c.totalMinutes},{identifier:"%t",value:c.totalSeconds},{identifier:"%D",value:h(c.days)},{identifier:"%H",value:h(c.hours)},{identifier:"%M",value:h(c.minutes)},{identifier:"%S",value:h(c.seconds)},{identifier:"%G",value:h(c.totalMinutes)},{identifier:"%T",value:h(c.totalSeconds)}];return d.forEach(function(a){b=b.replace(a.identifier,a.value)}),b},m=function(a){if(!a)throw new Error("durationTimeToSeconds expects a string argument!");if(!isNaN(Number(a)))return a;a=a.toLowerCase();var b=a.match(/\d{1,2}d/),c=a.match(/\d{1,2}h/),d=a.match(/\d{1,2}m/),e=a.match(/\d{1,2}s/);if(!(b||c||d||e))throw new Error("Invalid string passed in durationTimeToSeconds!");var g=0;return b&&(g+=Number(b[0].replace("d","")*f["default"].DAYINSECONDS)),c&&(g+=Number(c[0].replace("h","")*f["default"].THIRTYSIXHUNDRED)),d&&(g+=Number(d[0].replace("m",""))*f["default"].SIXTY),e&&(g+=Number(e[0].replace("s",""))),g},n=function(a){var b=void 0,c=void 0;return a.indexOf("sec")>0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(b[0]*f["default"].SIXTY)+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*f["default"].DAYINSECONDS)+Number(b[1]*f["default"].THIRTYSIXHUNDRED)+Number(b[2]*f["default"].SIXTY)+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(b[0]*f["default"].THIRTYSIXHUNDRED)+Number(b[1]*f["default"].SIXTY)+Number(b[2])),c},o=function(a,b){a.state=b,$(a.element).data("state",b)},p=function(a){$(a.element).on("focus",function(){a.pause()}),$(a.element).on("blur",function(){a.totalSeconds=n($(a.element)[a.html]()),a.resume()})},q=function(a){return a.totalSeconds=j()-a.startTime,a.config.countdown?(a.totalSeconds=a.config.duration-a.totalSeconds,0===a.totalSeconds&&(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.callback(),$(a.element).data("seconds")),void a.render()):(a.render(),void(a.config.duration&&a.totalSeconds>0&&a.totalSeconds%a.config.duration===0&&(a.config.callback&&a.config.callback(),a.config.repeat||(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.duration=null))))};b["default"]={getDefaultConfig:i,unixSeconds:j,secondsToPrettyTime:k,secondsToFormattedTime:l,durationTimeToSeconds:m,prettyTimeToSeconds:n,setState:o,makeEditable:p,intervalHandler:q}}]);
\ No newline at end of file
+/*! timer.jquery 0.6.4 2017-03-22*/!function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}var e=c(1),f=d(e),g=c(2),h=d(g);!function(){$.fn.timer=function(a){return a=a||"start",this.each(function(){$.data(this,h["default"].PLUGIN_NAME)instanceof f["default"]||$.data(this,h["default"].PLUGIN_NAME,new f["default"](this,a));var b=$.data(this,h["default"].PLUGIN_NAME);"string"==typeof a?"function"==typeof b[a]&&b[a]():b.start()})}}()},function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}function e(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(b,"__esModule",{value:!0});var f=function(){function a(a,b){for(var c=0;c0&&void 0!==arguments[0]?arguments[0]:0,b=Math.floor(a/60);return{days:a>=f["default"].DAYINSECONDS?Math.floor(a/f["default"].DAYINSECONDS):0,hours:a>=3600?Math.floor(a%f["default"].DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}},h=function(a){return a=parseInt(a,10),(a<10&&"0")+a},i=function(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}},j=function(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)},k=function(a){var b=g(a);if(b.days)return b.days+":"+h(b.hours)+":"+h(b.minutes)+":"+h(b.seconds);if(b.hours)return b.hours+":"+h(b.minutes)+":"+h(b.seconds);var c="";return c=b.minutes?b.minutes+":"+h(b.seconds)+" min":b.seconds+" sec"},l=function(a,b){for(var c=g(a),d=[{identifier:"%d",value:c.days},{identifier:"%h",value:c.hours},{identifier:"%m",value:c.minutes},{identifier:"%s",value:c.seconds},{identifier:"%g",value:c.totalMinutes},{identifier:"%t",value:c.totalSeconds},{identifier:"%D",value:h(c.days)},{identifier:"%H",value:h(c.hours)},{identifier:"%M",value:h(c.minutes)},{identifier:"%S",value:h(c.seconds)},{identifier:"%G",value:h(c.totalMinutes)},{identifier:"%T",value:h(c.totalSeconds)}],e=0;e0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*f["default"].DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c},o=function(a,b){a.state=b,$(a.element).data("state",b)},p=function(a){$(a.element).on("focus",function(){a.pause()}),$(a.element).on("blur",function(){a.totalSeconds=n($(a.element)[a.html]()),a.resume()})},q=function(a){return a.totalSeconds=j()-a.startTime,a.config.countdown?(a.totalSeconds=a.config.duration-a.totalSeconds,0===a.totalSeconds&&(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.callback(),$(a.element).data("seconds")),void a.render()):(a.render(),void(a.config.duration&&a.totalSeconds>0&&a.totalSeconds%a.config.duration===0&&(a.config.callback&&a.config.callback(),a.config.repeat||(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.duration=null))))};b["default"]={getDefaultConfig:i,unixSeconds:j,secondsToPrettyTime:k,secondsToFormattedTime:l,durationTimeToSeconds:m,prettyTimeToSeconds:n,setState:o,makeEditable:p,intervalHandler:q}}]);
\ No newline at end of file
diff --git a/package.json b/package.json
index cd11a2f..97c73f4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.6.4",
+ "version": "0.6.5",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
diff --git a/src/constants.js b/src/constants.js
index f22a0bd..13f3405 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,10 +2,7 @@ const Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
- DAYINSECONDS: 86400,
- THIRTYSIXHUNDRED: 3600,
- SIXTY: 60,
- TEN: 10
+ DAYINSECONDS: 86400
};
export default Constants;
diff --git a/src/utils.js b/src/utils.js
index f2a426e..bbacbf0 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -8,27 +8,21 @@ import Constants from './constants';
* @return {Object} Object with days, hours, minutes, totalMinutes, seconds and totalSeconds
*/
const _secondsToTimeObj = (totalSeconds = 0) => {
- let days = 0;
- let hours = 0;
- let totalMinutes = Math.floor(totalSeconds / Constants.SIXTY);
- let minutes = totalMinutes;
- let seconds;
-
- if (totalSeconds >= Constants.DAYINSECONDS) {
- days = Math.floor(totalSeconds / Constants.DAYINSECONDS);
- }
-
- if (totalSeconds >= Constants.THIRTYSIXHUNDRED) {
- hours = Math.floor(totalSeconds % Constants.DAYINSECONDS / Constants.THIRTYSIXHUNDRED);
- }
-
- if (totalSeconds >= Constants.SIXTY) {
- minutes = Math.floor(totalSeconds % Constants.THIRTYSIXHUNDRED / Constants.SIXTY);
- }
-
- seconds = totalSeconds % Constants.SIXTY;
-
- return {days, hours, minutes, totalMinutes, seconds, totalSeconds};
+ let totalMinutes = Math.floor(totalSeconds / 60);
+ return {
+ days: totalSeconds >= Constants.DAYINSECONDS ?
+ Math.floor(totalSeconds / Constants.DAYINSECONDS) :
+ 0,
+ hours: totalSeconds >= 3600 ?
+ Math.floor(totalSeconds % Constants.DAYINSECONDS / 3600) :
+ 0,
+ totalMinutes,
+ minutes: totalSeconds >= 60 ?
+ Math.floor(totalSeconds % 3600 / 60) :
+ totalMinutes,
+ seconds: totalSeconds % 60,
+ totalSeconds
+ };
};
/**
@@ -39,12 +33,13 @@ const _secondsToTimeObj = (totalSeconds = 0) => {
*/
const _paddedValue = num => {
num = parseInt(num, 10);
- if (num < 10) {
- return '0' + num;
- }
- return num;
+ return (num < 10 && '0') + num;
};
+/**
+ * Method to return the base settings that can be used in case of no or missing options
+ * @return {Object} Default config
+ */
const getDefaultConfig = () => ({
seconds: 0, // Default seconds value to start timer from
editable: false, // Allow making changes to the time by clicking on it
@@ -61,7 +56,7 @@ const getDefaultConfig = () => ({
/**
* @return {Number} Return seconds passed since Jan 1, 1970
*/
-const unixSeconds = () => (Math.round(Date.now() / 1000));
+const unixSeconds = () => Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
/**
* Convert seconds to pretty time.
@@ -113,9 +108,11 @@ const secondsToFormattedTime = (seconds, formattedTime) => {
{identifier: '%G', value: _paddedValue(timeObj.totalMinutes)},
{identifier: '%T', value: _paddedValue(timeObj.totalSeconds)}
];
- formatDef.forEach(function(fmt) {
- formattedTime = formattedTime.replace(fmt.identifier, fmt.value);
- });
+
+ // Use `for` loop to support ie8 after transpilation
+ for (let i = 0; i < formatDef.length; i++) {
+ formattedTime = formattedTime.replace(formatDef[i].identifier, formatDef[i].value);
+ }
return formattedTime;
};
@@ -126,42 +123,37 @@ const secondsToFormattedTime = (seconds, formattedTime) => {
* @return {Number} Returns 330
*/
const durationTimeToSeconds = timeFormat => {
- if (!timeFormat) {
- throw new Error('durationTimeToSeconds expects a string argument!');
- }
-
- // Early return in case a number is passed
if (!isNaN(Number(timeFormat))) {
+ // A number was passed
return timeFormat;
}
timeFormat = timeFormat.toLowerCase();
- let days = timeFormat.match(/\d{1,2}d/); // Match 10d in 10d5h30m10s
- let hrs = timeFormat.match(/\d{1,2}h/); // Match 5h in 5h30m10s
- let mins = timeFormat.match(/\d{1,2}m/); // Match 30m in 5h30m10s
- let secs = timeFormat.match(/\d{1,2}s/); // Match 10s in 5h30m10s
+ let days = timeFormat.match(/\d+d/); // Match 10d in 10d5h30m10s
+ let hrs = timeFormat.match(/\d+h/); // Match 5h in 5h30m10s
+ let mins = timeFormat.match(/\d+m/); // Match 30m in 5h30m10s
+ let secs = timeFormat.match(/\d+s/); // Match 10s in 5h30m10s
if (!days && !hrs && !mins && !secs) {
throw new Error('Invalid string passed in durationTimeToSeconds!');
}
- let seconds = 0;
+ let seconds = 0;
if (days) {
- seconds += Number(days[0].replace('d', '') * Constants.DAYINSECONDS);
+ seconds += Number(days[0].replace('d', '')) * Constants.DAYINSECONDS;
}
if (hrs) {
- seconds += Number(hrs[0].replace('h', '') * Constants.THIRTYSIXHUNDRED);
+ seconds += Number(hrs[0].replace('h', '')) * 3600;
}
if (mins) {
- seconds += Number(mins[0].replace('m', '')) * Constants.SIXTY;
+ seconds += Number(mins[0].replace('m', '')) * 60;
}
if (secs) {
seconds += Number(secs[0].replace('s', ''));
}
-
return seconds;
};
@@ -180,14 +172,14 @@ const prettyTimeToSeconds = editedTime => {
} else if (editedTime.indexOf('min') > 0) {
editedTime = editedTime.replace(/\smin/g, '');
arr = editedTime.split(':');
- time = Number(arr[0] * Constants.SIXTY) + Number(arr[1]);
+ time = Number(arr[0] * 60) + Number(arr[1]);
} else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)) {
arr = editedTime.split(':');
- time = Number(arr[0] * Constants.DAYINSECONDS) + Number(arr[1] * Constants.THIRTYSIXHUNDRED) +
- Number(arr[2] * Constants.SIXTY) + Number(arr[3]);
+ time = Number(arr[0] * Constants.DAYINSECONDS) + Number(arr[1] * 3600) +
+ Number(arr[2] * 60) + Number(arr[3]);
} else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}/)) {
arr = editedTime.split(':');
- time = Number(arr[0] * Constants.THIRTYSIXHUNDRED) + Number(arr[1] * Constants.SIXTY) + Number(arr[2]);
+ time = Number(arr[0] * 3600) + Number(arr[1] * 60) + Number(arr[2]);
}
return time;
From 17a4582bbcf642267d1b1a99323c5168bf219a3a Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Sat, 15 Apr 2017 17:33:39 -0700
Subject: [PATCH 03/15] Move to ES 5
---
.babelrc | 3 -
.eslintrc.json | 8 -
.jscsrc | 9 +
CONTRIBUTING.md | 12 +-
Gruntfile.js | 47 +-
LICENSE-MIT | 2 +-
bower.json | 6 +-
dist/timer.jquery.js | 927 +++++++++++++++++----------------------
dist/timer.jquery.min.js | 2 +-
index.html | 365 ---------------
package.json | 30 +-
src/Timer.js | 175 ++++----
src/constants.js | 4 +-
src/index.js | 61 ++-
src/utils.js | 120 ++---
test/utils-test.js | 24 +-
webpack.config.js | 19 -
17 files changed, 661 insertions(+), 1153 deletions(-)
delete mode 100644 .babelrc
delete mode 100644 .eslintrc.json
create mode 100644 .jscsrc
delete mode 100644 index.html
delete mode 100644 webpack.config.js
diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 7b37dd5..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "presets": ["es2015"]
-}
diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index 78ab966..0000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "extends": "google",
- "installedESLint": true,
- "rules": {
- "indent": ["error", "tab"],
- "max-len": ["error", 120]
- }
-}
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 0000000..15fbb0b
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,9 @@
+{
+ "preset": "jquery",
+ "requireSpacesInsideParentheses": false,
+ "validateQuoteMarks": true,
+ "requireSpacesInsideBrackets": false,
+ "requireSpacesInsideObjectBrackets": false,
+ "maximumLineLength": 120,
+ "requirePaddingNewLinesBeforeLineComments": false
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0d33d3a..36bee3d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,15 +2,15 @@
This project is an outcome of a lot of contributions from developers who have been kind enough to point out any issues and/or have taken the time to create pull requests that fix issues or add new features to this repo. In other words, contributions are welcome :) Here are some guidelines to consider:
-- The jQuery timer plugin is written in ES6. It uses babel along with webpack for transpiling to ES5
+- The jQuery timer plugin is written in ES 5. It was written in ES 6 when I once felt that the browsers will catchup to ES6 and we ll not have to transpile anymore. The transpiled version of the jQuery timer adds 30% cruft to the code just to manage the fancy syntax. I moved away from it coz I realized users of this plugin don't care about that and should not be subjected to it.
- All source code is in the `src` directory. Any changes you make should ideally happen in the files inside `src` (unless you are making changes to the README or this file itself)
- To start contributing code changes, fork this repo to your Github account and clone it in your local computer
- Run `npm install` to install all the dependencies
-- The package.json has all the required commands for you to test and transpile
- * `npm test` to run eslint and the unit tests
- * `npm run webpack` to transpile the scripts from the _src_ directory to _dist/timer.jquery.js_
- * `npm grunt` for minifying the transpiled file to _dist/timer.jquery.min.js_
+- The package.json has all the required commands for you to test, lint, style check and put together a production file
+ * `npm test` to run unit tests
+ * `npm run build` for running jscs, jshint, concat and uglify to generate timer.jquery.js and timer.jquery.min.js inside dist/
+ * `npm run watch` Watch over files from src and test as you work on them to running jscs, jshint, concat and uglify on changes
- Once you ve made the changes and are sure that the existing tests pass, commit them to your _origin_ and issue a Pull Request to the upstream (this repo)
- Please write tests for your changes
-That's it. Happy coding!
\ No newline at end of file
+That's it. Time is precious, use it wisely & Happy Coding :)
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index a48d244..e1a15cb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,21 +1,46 @@
-module.exports = function (grunt) {
+module.exports = function(grunt) {
+ var commonTasks = ['jscs', 'jshint', 'concat', 'uglify'];
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
- uglify: {
+ jscs: {
+ src: ['Gruntfile.js', 'src/*.js', 'test/*.js']
+ },
+
+ jshint: {
+ all: ['Gruntfile.js', 'src/*.js', 'test/*.js']
+ },
+
+ concat: {
options: {
- banner: '/*! <%= pkg.name %> <%= pkg.version %> <%=grunt.template.today("yyyy-mm-dd")%>*/'
+ banner: [
+ '/*! <%= pkg.name %> <%= pkg.version %> <%=grunt.template.today("yyyy-mm-dd")%>*/\n',
+ '(function() {\n'
+ ].join(''),
+ footer: '} ());'
},
dist: {
- src: ['dist/timer.jquery.js'],
+ src: [
+ 'src/constants.js',
+ 'src/utils.js',
+ 'src/Timer.js',
+ 'src/index.js'
+ ],
+ dest: 'dist/timer.jquery.js'
+ }
+ },
+
+ uglify: {
+ dist: {
+ src: 'dist/timer.jquery.js',
dest: 'dist/timer.jquery.min.js'
- },
+ }
},
watch: {
scripts: {
- files: ['dist/timer.jquery.js'],
- tasks: ['uglify'],
+ files: ['src/*.js'],
+ tasks: commonTasks,
options: {
nospawn: true
}
@@ -23,9 +48,11 @@ module.exports = function (grunt) {
}
});
+ grunt.loadNpmTasks('grunt-jscs');
+ grunt.loadNpmTasks('grunt-contrib-jshint');
+ grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
- //register default task
- grunt.registerTask('default', 'watch');
-}
+ grunt.registerTask('default', commonTasks);
+};
diff --git a/LICENSE-MIT b/LICENSE-MIT
index fd1c181..b9a8bc2 100644
--- a/LICENSE-MIT
+++ b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Walmik Deshpande
+Copyright (c) 2017 Walmik Deshpande
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
diff --git a/bower.json b/bower.json
index 5d3cf71..90302d9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,15 +1,11 @@
{
"name": "timer.jquery",
"ignore": [
- ".babelrc",
- ".eslintrc.json",
".gitignore",
".travis.yml",
"Gruntfile.js",
- "index.html",
"package.json",
- "test",
- "webpack.config.js"
+ "test"
],
"dependencies": {
"jquery": ">=1.9.0"
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index 3202055..61c52d3 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -1,537 +1,424 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ // The module cache
-/******/ var installedModules = {};
-
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-
-/******/ // Check if module is in cache
-/******/ if(installedModules[moduleId])
-/******/ return installedModules[moduleId].exports;
-
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = installedModules[moduleId] = {
-/******/ exports: {},
-/******/ id: moduleId,
-/******/ loaded: false
-/******/ };
-
-/******/ // Execute the module function
-/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ // Flag the module as loaded
-/******/ module.loaded = true;
-
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-
-
-/******/ // expose the modules object (__webpack_modules__)
-/******/ __webpack_require__.m = modules;
-
-/******/ // expose the module cache
-/******/ __webpack_require__.c = installedModules;
-
-/******/ // __webpack_public_path__
-/******/ __webpack_require__.p = "";
-
-/******/ // Load entry module and return exports
-/******/ return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
- 'use strict';
-
- var _Timer = __webpack_require__(1);
-
- var _Timer2 = _interopRequireDefault(_Timer);
-
- var _constants = __webpack_require__(2);
-
- var _constants2 = _interopRequireDefault(_constants);
-
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
- /* global $:true */
-
- (function () {
- $.fn.timer = function (options) {
- options = options || 'start';
-
- return this.each(function () {
- if (!($.data(this, _constants2.default.PLUGIN_NAME) instanceof _Timer2.default)) {
- /**
- * Create a new data attribute on the element to hold the plugin name
- * This way we can know which plugin(s) is/are initialized on the element later
- */
- $.data(this, _constants2.default.PLUGIN_NAME, new _Timer2.default(this, options));
- }
-
- /**
- * Use the instance of this plugin derived from the data attribute for this element
- * to conduct whatever action requested as a string parameter.
- */
- var instance = $.data(this, _constants2.default.PLUGIN_NAME);
-
- /**
- * Provision for calling a function from this plugin
- * without initializing it all over again
- */
- if (typeof options === 'string') {
- if (typeof instance[options] === 'function') {
- /*
- Pass in 'instance' to provide for the value of 'this' in the called function
- */
- instance[options]();
- }
- } else {
- instance.start();
- }
- });
- };
- })();
-
-/***/ },
-/* 1 */
-/***/ function(module, exports, __webpack_require__) {
-
- 'use strict';
-
- Object.defineProperty(exports, "__esModule", {
- value: true
- });
-
- var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); /* global $:true */
-
-
- var _constants = __webpack_require__(2);
-
- var _constants2 = _interopRequireDefault(_constants);
-
- var _utils = __webpack_require__(3);
-
- var _utils2 = _interopRequireDefault(_utils);
-
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
- function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
- /**
- * Timer class to be instantiated on every element.
- * All relative values will be stored at instance level.
- */
- var Timer = function () {
- /**
- * Construct a Timer instance on the provided element with the given config.
- * @param {Object} element HTML node as passed by jQuery
- * @param {Object|String} config User extended options or a string (start, pause, resume etc)
- */
- function Timer(element, config) {
- _classCallCheck(this, Timer);
-
- this.element = element;
- this.originalConfig = $.extend({}, config);
- this.totalSeconds = 0;
- this.intervalId = null;
- // A HTML element will have the html() method in jQuery to inject content,
- this.html = 'html';
- if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
- // In case of input element or a textarea, jQuery provides the val() method to inject content
- this.html = 'val';
- }
-
- this.config = _utils2.default.getDefaultConfig();
-
- if (config.duration) {
- config.duration = _utils2.default.durationTimeToSeconds(config.duration);
- }
-
- if (typeof config !== 'string') {
- this.config = $.extend(this.config, config);
- }
-
- if (this.config.seconds) {
- this.totalSeconds = this.config.seconds;
- }
-
- if (this.config.editable) {
- _utils2.default.makeEditable(this);
- }
-
- this.startTime = _utils2.default.unixSeconds() - this.totalSeconds;
-
- // In case duration is set along with a callback as well as repeat,
- // then the update frequency needs to be at least 1000ms to prevent callback from being fired more than once
- if (this.config.duration && this.config.repeat && this.config.updateFrequency < 1000) {
- this.config.updateFrequency = 1000;
- }
-
- // If countdown is set, ensure duration is set as well
- // Also set the total seconds to the duration so that the first render gets the correct value
- if (this.config.countdown) {
- if (!this.config.duration) {
- throw new Error('Countdown option set without duration!');
- }
-
- if (this.config.editable) {
- throw new Error('Cannot set editable on a countdown timer!');
- }
- this.config.startTime = _utils2.default.unixSeconds() - this.config.duration;
- this.totalSeconds = this.config.duration;
- }
- }
-
- _createClass(Timer, [{
- key: 'start',
- value: function start() {
- if (this.state !== _constants2.default.TIMER_RUNNING) {
- _utils2.default.setState(this, _constants2.default.TIMER_RUNNING);
- this.render();
- this.intervalId = setInterval(_utils2.default.intervalHandler.bind(null, this), this.config.updateFrequency);
- }
- }
- }, {
- key: 'pause',
- value: function pause() {
- if (this.state === _constants2.default.TIMER_RUNNING) {
- _utils2.default.setState(this, _constants2.default.TIMER_PAUSED);
- clearInterval(this.intervalId);
- }
- }
- }, {
- key: 'resume',
- value: function resume() {
- if (this.state === _constants2.default.TIMER_PAUSED) {
- _utils2.default.setState(this, _constants2.default.TIMER_RUNNING);
- if (this.config.countdown) {
- this.startTime = _utils2.default.unixSeconds() - this.config.duration + this.totalSeconds;
- } else {
- this.startTime = _utils2.default.unixSeconds() - this.totalSeconds;
- }
- this.intervalId = setInterval(_utils2.default.intervalHandler.bind(null, this), this.config.updateFrequency);
- }
- }
- }, {
- key: 'remove',
- value: function remove() {
- clearInterval(this.intervalId);
- $(this.element).data(_constants2.default.PLUGIN_NAME, null);
- }
- }, {
- key: 'reset',
- value: function reset() {
- var element = this.element;
- var originalConfig = this.originalConfig;
- this.remove();
- $(element).timer(originalConfig);
- }
- }, {
- key: 'render',
- value: function render() {
- if (this.config.format) {
- $(this.element)[this.html](_utils2.default.secondsToFormattedTime(this.totalSeconds, this.config.format));
- } else {
- $(this.element)[this.html](_utils2.default.secondsToPrettyTime(this.totalSeconds));
- }
- // Make total seconds available via timer element's data attribute
- $(this.element).data('seconds', this.totalSeconds);
- }
- }]);
-
- return Timer;
- }();
-
- exports.default = Timer;
-
-/***/ },
-/* 2 */
-/***/ function(module, exports) {
-
- 'use strict';
-
- Object.defineProperty(exports, "__esModule", {
- value: true
- });
- var Constants = {
- PLUGIN_NAME: 'timer',
- TIMER_RUNNING: 'running',
- TIMER_PAUSED: 'paused',
- DAYINSECONDS: 86400
- };
-
- exports.default = Constants;
-
-/***/ },
-/* 3 */
-/***/ function(module, exports, __webpack_require__) {
-
- 'use strict';
-
- Object.defineProperty(exports, "__esModule", {
- value: true
- });
-
- var _constants = __webpack_require__(2);
-
- var _constants2 = _interopRequireDefault(_constants);
-
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
- /**
- * Private
- * Convert (a number) seconds to a Object with days, hours, minutes etc as properties
- * Used by secondsToPrettyTime for to format the time display
- * @param {Number} totalSeconds The total seconds that needs to be distributed into an Object
- * @return {Object} Object with days, hours, minutes, totalMinutes, seconds and totalSeconds
- */
- var _secondsToTimeObj = function _secondsToTimeObj() {
- var totalSeconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-
- var totalMinutes = Math.floor(totalSeconds / 60);
- return {
- days: totalSeconds >= _constants2.default.DAYINSECONDS ? Math.floor(totalSeconds / _constants2.default.DAYINSECONDS) : 0,
- hours: totalSeconds >= 3600 ? Math.floor(totalSeconds % _constants2.default.DAYINSECONDS / 3600) : 0,
- totalMinutes: totalMinutes,
- minutes: totalSeconds >= 60 ? Math.floor(totalSeconds % 3600 / 60) : totalMinutes,
- seconds: totalSeconds % 60,
- totalSeconds: totalSeconds
- };
+/*! timer.jquery 0.7.0 2017-04-15*/
+(function() {
+var Constants = {
+ PLUGIN_NAME: 'timer',
+ TIMER_RUNNING: 'running',
+ TIMER_PAUSED: 'paused',
+ DAYINSECONDS: 86400
+};
+
+/* global Constants:true */
+/**
+ * Private
+ * Convert (a number) seconds to a Object with days, hours, minutes etc as properties
+ * Used by secondsToPrettyTime for to format the time display
+ * @param {Number} totalSeconds The total seconds that needs to be distributed into an Object
+ * @return {Object} Object with days, hours, minutes, totalMinutes, seconds and totalSeconds
+ */
+function _secondsToTimeObj(totalSeconds) {
+ var totalMinutes;
+ totalSeconds = totalSeconds || 0;
+ totalMinutes = Math.floor(totalSeconds / 60);
+ return {
+ days: totalSeconds >= Constants.DAYINSECONDS ?
+ Math.floor(totalSeconds / Constants.DAYINSECONDS) :
+ 0,
+ hours: totalSeconds >= 3600 ?
+ Math.floor(totalSeconds % Constants.DAYINSECONDS / 3600) :
+ 0,
+ totalMinutes: totalMinutes,
+ minutes: totalSeconds >= 60 ?
+ Math.floor(totalSeconds % 3600 / 60) :
+ totalMinutes,
+ seconds: totalSeconds % 60,
+ totalSeconds: totalSeconds
};
-
- /**
- * Private
- * Method to pad a given number with a 0 in case it's less than 10
- * @param {Number} num The number to be padded
- * @return {String|Number} Padded (if less than 10) number
- */
- /* global $:true */
- var _paddedValue = function _paddedValue(num) {
- num = parseInt(num, 10);
- return (num < 10 && '0') + num;
+}
+
+/**
+ * Private
+ * Method to pad a given number with a 0 in case it's less than 10
+ * @param {Number} num The number to be padded
+ * @return {String|Number} Padded (if less than 10) number
+ */
+function _paddedValue(num) {
+ num = parseInt(num, 10);
+ return (num < 10 && '0') + num;
+}
+
+/**
+ * Method to return the base settings that can be used in case of no or missing options
+ * @return {Object} Default config
+ */
+function getDefaultConfig() {
+ return {
+ seconds: 0, // Default seconds value to start timer from
+ editable: false, // Allow making changes to the time by clicking on it
+ duration: null, // Duration to run callback after
+ callback: function() { // Default callback to run after elapsed duration
+ console.log('Time up!');
+ },
+ repeat: false, // This will repeat callback every n times duration is elapsed
+ countdown: false, // If true, this will render the timer as a countdown (must have duration)
+ format: null, // This sets the format in which the time will be printed
+ updateFrequency: 500 // How often should timer display update
};
+}
+
+/**
+ * @return {Number} Return seconds passed since Jan 1, 1970
+ */
+function unixSeconds() {
+ return Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
+}
+
+/**
+ * Convert seconds to pretty time.
+ * For example 100 becomes 1:40 min, 34 becomes 34 sec and 10000 becomes 2:46:40
+ * @param {Number} seconds Seconds to be converted
+ * @return {String} Pretty time
+ */
+function secondsToPrettyTime(seconds) {
+ var timeObj = _secondsToTimeObj(seconds);
+
+ if (timeObj.days) {
+ return timeObj.days + ':' + _paddedValue(timeObj.hours) + ':' +
+ _paddedValue(timeObj.minutes) + ':' + _paddedValue(timeObj.seconds);
+ }
+
+ if (timeObj.hours) {
+ return timeObj.hours +
+ ':' + _paddedValue(timeObj.minutes) +
+ ':' + _paddedValue(timeObj.seconds);
+ }
+
+ var prettyTime = '';
+ if (timeObj.minutes) {
+ prettyTime = timeObj.minutes + ':' + _paddedValue(timeObj.seconds) + ' min';
+ } else {
+ prettyTime = timeObj.seconds + ' sec';
+ }
+
+ return prettyTime;
+}
+
+/**
+ * Convert seconds to user defined format for time
+ * @param {Number} seconds Seconds to be converted
+ * @param {String} formattedTime User defined format
+ * @return {String} Formatted time string
+ */
+function secondsToFormattedTime(seconds, formattedTime) {
+ var timeObj = _secondsToTimeObj(seconds);
+ var formatDef = [
+ {identifier: '%d', value: timeObj.days},
+ {identifier: '%h', value: timeObj.hours},
+ {identifier: '%m', value: timeObj.minutes},
+ {identifier: '%s', value: timeObj.seconds},
+ {identifier: '%g', value: timeObj.totalMinutes},
+ {identifier: '%t', value: timeObj.totalSeconds},
+ {identifier: '%D', value: _paddedValue(timeObj.days)},
+ {identifier: '%H', value: _paddedValue(timeObj.hours)},
+ {identifier: '%M', value: _paddedValue(timeObj.minutes)},
+ {identifier: '%S', value: _paddedValue(timeObj.seconds)},
+ {identifier: '%G', value: _paddedValue(timeObj.totalMinutes)},
+ {identifier: '%T', value: _paddedValue(timeObj.totalSeconds)}
+ ];
+
+ // Use `for` loop to support ie8 after transpilation
+ for (var i = 0; i < formatDef.length; i++) {
+ formattedTime = formattedTime.replace(formatDef[i].identifier, formatDef[i].value);
+ }
+
+ return formattedTime;
+}
+
+/**
+ * Convert duration time format to seconds
+ * @param {String} timeFormat e.g. 5m30s
+ * @return {Number} Returns 330
+ */
+function durationTimeToSeconds(timeFormat) {
+ if (!isNaN(Number(timeFormat))) {
+ return timeFormat; // A number was passed
+ }
+
+ timeFormat = timeFormat.toLowerCase();
+ var days = timeFormat.match(/\d+d/); // Match 10d in 10d5h30m10s
+ var hrs = timeFormat.match(/\d+h/); // Match 5h in 5h30m10s
+ var mins = timeFormat.match(/\d+m/); // Match 30m in 5h30m10s
+ var secs = timeFormat.match(/\d+s/); // Match 10s in 5h30m10s
+
+ if (!days && !hrs && !mins && !secs) {
+ throw new Error('Invalid string passed in durationTimeToSeconds!');
+ }
+
+ var seconds = 0;
+ if (days) {
+ seconds += Number(days[0].replace('d', '')) * Constants.DAYINSECONDS;
+ }
+
+ if (hrs) {
+ seconds += Number(hrs[0].replace('h', '')) * 3600;
+ }
+
+ if (mins) {
+ seconds += Number(mins[0].replace('m', '')) * 60;
+ }
+
+ if (secs) {
+ seconds += Number(secs[0].replace('s', ''));
+ }
+ return seconds;
+}
+
+/**
+ * Parse pretty time and return it as seconds
+ * Currently only the native pretty time is parseable
+ * @param {String} editedTime The time as edited by the user
+ * @return {Number} Parsed time
+ */
+function prettyTimeToSeconds(editedTime) {
+ var arr, time;
+
+ if (editedTime.indexOf('sec') > 0) {
+ time = Number(editedTime.replace(/\ssec/g, ''));
+ } else if (editedTime.indexOf('min') > 0) {
+ editedTime = editedTime.replace(/\smin/g, '');
+ arr = editedTime.split(':');
+ time = Number(arr[0] * 60) + Number(arr[1]);
+ } else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)) {
+ arr = editedTime.split(':');
+ time = Number(arr[0] * Constants.DAYINSECONDS) + Number(arr[1] * 3600) +
+ Number(arr[2] * 60) + Number(arr[3]);
+ } else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}/)) {
+ arr = editedTime.split(':');
+ time = Number(arr[0] * 3600) + Number(arr[1] * 60) + Number(arr[2]);
+ }
+
+ return time;
+}
+
+/**
+ * Set the provided state of the timer in the data attr `state` of the timer HTML element
+ * @param {Object} timerInstance Instance of the timer object
+ * @param {[type]} newState The state to be set on the HTML element
+ */
+function setState(timerInstance, newState) {
+ timerInstance.state = newState;
+ $(timerInstance.element).data('state', newState);
+}
+
+/**
+ * Convenience method to wire up focus & blur events to pause and resume
+ * Makes use of the local `prettyTimeToSeconds` function to convert user edited time to seconds
+ * @param {Object} timerInstance Instance of the Timer Class
+ */
+function makeEditable(timerInstance) {
+ $(timerInstance.element).on('focus', function() {
+ timerInstance.pause();
+ });
- /**
- * Method to return the base settings that can be used in case of no or missing options
- * @return {Object} Default config
- */
- var getDefaultConfig = function getDefaultConfig() {
- return {
- seconds: 0, // Default seconds value to start timer from
- editable: false, // Allow making changes to the time by clicking on it
- duration: null, // Duration to run callback after
- callback: function callback() {
- // Default callback to run after elapsed duration
- console.log('Time up!');
- },
- repeat: false, // this will repeat callback every n times duration is elapsed
- countdown: false, // if true, this will render the timer as a countdown (must have duration)
- format: null, // this sets the format in which the time will be printed
- updateFrequency: 500 // How often should timer display update
- };
- };
-
- /**
- * @return {Number} Return seconds passed since Jan 1, 1970
- */
- var unixSeconds = function unixSeconds() {
- return Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
- };
-
- /**
- * Convert seconds to pretty time.
- * For example 100 becomes 1:40 min, 34 becomes 34 sec and 10000 becomes 2:46:40
- * @param {Number} seconds Seconds to be converted
- * @return {String} Pretty time
- */
- var secondsToPrettyTime = function secondsToPrettyTime(seconds) {
- var timeObj = _secondsToTimeObj(seconds);
-
- if (timeObj.days) {
- return timeObj.days + ':' + _paddedValue(timeObj.hours) + ':' + _paddedValue(timeObj.minutes) + ':' + _paddedValue(timeObj.seconds);
- }
-
- if (timeObj.hours) {
- return timeObj.hours + ':' + _paddedValue(timeObj.minutes) + ':' + _paddedValue(timeObj.seconds);
- }
-
- var prettyTime = '';
- if (timeObj.minutes) {
- prettyTime = timeObj.minutes + ':' + _paddedValue(timeObj.seconds) + ' min';
- } else {
- prettyTime = timeObj.seconds + ' sec';
- }
-
- return prettyTime;
- };
-
- /**
- * Convert seconds to user defined format for time
- * @param {Number} seconds Seconds to be converted
- * @param {String} formattedTime User defined format
- * @return {String} Formatted time string
- */
- var secondsToFormattedTime = function secondsToFormattedTime(seconds, formattedTime) {
- var timeObj = _secondsToTimeObj(seconds);
- var formatDef = [{ identifier: '%d', value: timeObj.days }, { identifier: '%h', value: timeObj.hours }, { identifier: '%m', value: timeObj.minutes }, { identifier: '%s', value: timeObj.seconds }, { identifier: '%g', value: timeObj.totalMinutes }, { identifier: '%t', value: timeObj.totalSeconds }, { identifier: '%D', value: _paddedValue(timeObj.days) }, { identifier: '%H', value: _paddedValue(timeObj.hours) }, { identifier: '%M', value: _paddedValue(timeObj.minutes) }, { identifier: '%S', value: _paddedValue(timeObj.seconds) }, { identifier: '%G', value: _paddedValue(timeObj.totalMinutes) }, { identifier: '%T', value: _paddedValue(timeObj.totalSeconds) }];
-
- // Use `for` loop to support ie8 after transpilation
- for (var i = 0; i < formatDef.length; i++) {
- formattedTime = formattedTime.replace(formatDef[i].identifier, formatDef[i].value);
- }
-
- return formattedTime;
- };
-
- /**
- * Convert duration time format to seconds
- * @param {String} timeFormat e.g. 5m30s
- * @return {Number} Returns 330
- */
- var durationTimeToSeconds = function durationTimeToSeconds(timeFormat) {
- if (!isNaN(Number(timeFormat))) {
- // A number was passed
- return timeFormat;
- }
-
- timeFormat = timeFormat.toLowerCase();
- var days = timeFormat.match(/\d+d/); // Match 10d in 10d5h30m10s
- var hrs = timeFormat.match(/\d+h/); // Match 5h in 5h30m10s
- var mins = timeFormat.match(/\d+m/); // Match 30m in 5h30m10s
- var secs = timeFormat.match(/\d+s/); // Match 10s in 5h30m10s
-
- if (!days && !hrs && !mins && !secs) {
- throw new Error('Invalid string passed in durationTimeToSeconds!');
- }
-
- var seconds = 0;
- if (days) {
- seconds += Number(days[0].replace('d', '')) * _constants2.default.DAYINSECONDS;
+ $(timerInstance.element).on('blur', function() {
+ timerInstance.totalSeconds = prettyTimeToSeconds(
+ $(timerInstance.element)[timerInstance.html]()
+ );
+ timerInstance.resume();
+ });
+}
+
+/**
+ * The function that will be called via setInterval based on the timer's update frequency
+ * @param {Object} timerInstance Instance of the timer object
+ */
+function intervalHandler(timerInstance) {
+ timerInstance.totalSeconds = unixSeconds() - timerInstance.startTime;
+
+ if (timerInstance.config.countdown) {
+ timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
+
+ if (timerInstance.totalSeconds === 0) {
+ clearInterval(timerInstance.intervalId);
+ setState(timerInstance, Constants.TIMER_STOPPED);
+ timerInstance.config.callback();
+ $(timerInstance.element).data('seconds');
}
- if (hrs) {
- seconds += Number(hrs[0].replace('h', '')) * 3600;
+ timerInstance.render();
+ return;
+ }
+
+ timerInstance.render();
+ if (!timerInstance.config.duration) {
+ return;
+ }
+
+ // If the timer was called with a duration parameter,
+ // run the callback if duration is complete
+ // and remove the duration if `repeat` is not requested
+ if (timerInstance.totalSeconds > 0 &&
+ timerInstance.totalSeconds % timerInstance.config.duration === 0) {
+ if (timerInstance.config.callback) {
+ timerInstance.config.callback();
}
- if (mins) {
- seconds += Number(mins[0].replace('m', '')) * 60;
+ if (!timerInstance.config.repeat) {
+ clearInterval(timerInstance.intervalId);
+ setState(timerInstance, Constants.TIMER_STOPPED);
+ timerInstance.config.duration = null;
}
-
- if (secs) {
- seconds += Number(secs[0].replace('s', ''));
+ }
+}
+
+var utils = {
+ getDefaultConfig: getDefaultConfig,
+ unixSeconds: unixSeconds,
+ secondsToPrettyTime: secondsToPrettyTime,
+ secondsToFormattedTime: secondsToFormattedTime,
+ durationTimeToSeconds: durationTimeToSeconds,
+ prettyTimeToSeconds: prettyTimeToSeconds,
+ setState: setState,
+ makeEditable: makeEditable,
+ intervalHandler: intervalHandler
+};
+
+/**
+ * Timer function to initiate a timer on the provided element with the given config.
+ * @param {Object} element HTML node as passed by jQuery
+ * @param {Object|String} config User extended options or a string (start, pause, resume etc)
+ */
+function Timer(element, config) {
+ this.element = element;
+ this.originalConfig = $.extend({}, config);
+ this.totalSeconds = 0;
+ this.intervalId = null;
+ // A HTML element will have the html() method in jQuery to inject content,
+ this.html = 'html';
+ if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
+ // In case of input element or a textarea, jQuery provides the val() method to inject content
+ this.html = 'val';
+ }
+
+ this.config = utils.getDefaultConfig();
+
+ if (config.duration) {
+ config.duration = utils.durationTimeToSeconds(config.duration);
+ }
+
+ if (typeof config !== 'string') {
+ this.config = $.extend(this.config, config);
+ }
+
+ if (this.config.seconds) {
+ this.totalSeconds = this.config.seconds;
+ }
+
+ if (this.config.editable) {
+ utils.makeEditable(this);
+ }
+
+ this.startTime = utils.unixSeconds() - this.totalSeconds;
+
+ // In case duration is set along with a callback as well as repeat,
+ // then the update frequency needs to be at least 1000ms to prevent callback from being fired more than once
+ if (this.config.duration && this.config.repeat && this.config.updateFrequency < 1000) {
+ this.config.updateFrequency = 1000;
+ }
+
+ // If countdown is set, ensure duration is set as well
+ // Also set the total seconds to the duration so that the first render gets the correct value
+ if (this.config.countdown) {
+ if (!this.config.duration) {
+ throw new Error('Countdown option set without duration!');
}
- return seconds;
- };
- /**
- * Parse pretty time and return it as seconds
- * Currently only the native pretty time is parseable
- * @param {String} editedTime The time as edited by the user
- * @return {Number} Parsed time
- */
- var prettyTimeToSeconds = function prettyTimeToSeconds(editedTime) {
- var arr = void 0;
- var time = void 0;
-
- if (editedTime.indexOf('sec') > 0) {
- time = Number(editedTime.replace(/\ssec/g, ''));
- } else if (editedTime.indexOf('min') > 0) {
- editedTime = editedTime.replace(/\smin/g, '');
- arr = editedTime.split(':');
- time = Number(arr[0] * 60) + Number(arr[1]);
- } else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)) {
- arr = editedTime.split(':');
- time = Number(arr[0] * _constants2.default.DAYINSECONDS) + Number(arr[1] * 3600) + Number(arr[2] * 60) + Number(arr[3]);
- } else if (editedTime.match(/\d{1,2}:\d{2}:\d{2}/)) {
- arr = editedTime.split(':');
- time = Number(arr[0] * 3600) + Number(arr[1] * 60) + Number(arr[2]);
+ if (this.config.editable) {
+ throw new Error('Cannot set editable on a countdown timer!');
}
-
- return time;
- };
-
- /**
- * Set the provided state of the timer in the data attr `state` of the timer HTML element
- * @param {Object} timerInstance Instance of the timer object
- * @param {[type]} newState The state to be set on the HTML element
- */
- var setState = function setState(timerInstance, newState) {
- timerInstance.state = newState;
- $(timerInstance.element).data('state', newState);
- };
-
- /**
- * Convenience method to wire up focus & blur events to pause and resume
- * Makes use of the local `prettyTimeToSeconds` function to convert user edited time to seconds
- * @param {Object} timerInstance Instance of the Timer Class
- */
- var makeEditable = function makeEditable(timerInstance) {
- $(timerInstance.element).on('focus', function () {
- timerInstance.pause();
- });
-
- $(timerInstance.element).on('blur', function () {
- timerInstance.totalSeconds = prettyTimeToSeconds($(timerInstance.element)[timerInstance.html]());
- timerInstance.resume();
- });
- };
-
- /**
- * The function that will be called via setInterval based on the timer's update frequency
- * @param {Object} timerInstance Instance of the timer object
- */
- var intervalHandler = function intervalHandler(timerInstance) {
- timerInstance.totalSeconds = unixSeconds() - timerInstance.startTime;
-
- if (timerInstance.config.countdown) {
- timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
-
- if (timerInstance.totalSeconds === 0) {
- clearInterval(timerInstance.intervalId);
- setState(timerInstance, _constants2.default.TIMER_STOPPED);
- timerInstance.config.callback();
- $(timerInstance.element).data('seconds');
- }
-
- timerInstance.render();
- return;
+ this.config.startTime = utils.unixSeconds() - this.config.duration;
+ this.totalSeconds = this.config.duration;
+ }
+}
+
+Timer.prototype.start = function() {
+ if (this.state !== Constants.TIMER_RUNNING) {
+ utils.setState(this, Constants.TIMER_RUNNING);
+ this.render();
+ this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
+ }
+};
+
+Timer.prototype.pause = function() {
+ if (this.state === Constants.TIMER_RUNNING) {
+ utils.setState(this, Constants.TIMER_PAUSED);
+ clearInterval(this.intervalId);
+ }
+};
+
+Timer.prototype.resume = function() {
+ if (this.state === Constants.TIMER_PAUSED) {
+ utils.setState(this, Constants.TIMER_RUNNING);
+ if (this.config.countdown) {
+ this.startTime = utils.unixSeconds() - this.config.duration + this.totalSeconds;
+ } else {
+ this.startTime = utils.unixSeconds() - this.totalSeconds;
}
-
- timerInstance.render();
- if (!timerInstance.config.duration) {
- return;
+ this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
+ }
+};
+
+Timer.prototype.remove = function() {
+ clearInterval(this.intervalId);
+ $(this.element).data(Constants.PLUGIN_NAME, null);
+ $(this.element).data('seconds', null);
+};
+
+Timer.prototype.reset = function() {
+ var originalConfig = this.originalConfig;
+ this.remove();
+ $(this.element).timer(originalConfig);
+};
+
+Timer.prototype.render = function() {
+ if (this.config.format) {
+ $(this.element)[this.html](utils.secondsToFormattedTime(this.totalSeconds, this.config.format));
+ } else {
+ $(this.element)[this.html](utils.secondsToPrettyTime(this.totalSeconds));
+ }
+ $(this.element).data('seconds', this.totalSeconds);
+};
+
+/* global $:true */
+$.fn.timer = function(options) {
+ options = options || 'start';
+
+ return this.each(function() {
+ if (!($.data(this, Constants.PLUGIN_NAME) instanceof Timer)) {
+ /**
+ * Create a new data attribute on the element to hold the plugin name
+ * This way we can know which plugin(s) is/are initialized on the element later
+ */
+ $.data(this, Constants.PLUGIN_NAME, new Timer(this, options));
}
- // If the timer was called with a duration parameter,
- // run the callback if duration is complete
- // and remove the duration if `repeat` is not requested
- if (timerInstance.totalSeconds > 0 && timerInstance.totalSeconds % timerInstance.config.duration === 0) {
- if (timerInstance.config.callback) {
- timerInstance.config.callback();
- }
+ /**
+ * Use the instance of this plugin derived from the data attribute for this element
+ * to conduct whatever action requested as a string parameter.
+ */
+ var instance = $.data(this, Constants.PLUGIN_NAME);
- if (!timerInstance.config.repeat) {
- clearInterval(timerInstance.intervalId);
- setState(timerInstance, _constants2.default.TIMER_STOPPED);
- timerInstance.config.duration = null;
+ /**
+ * Provision for calling a function from this plugin
+ * without initializing it all over again
+ */
+ if (typeof options === 'string') {
+ if (typeof instance[options] === 'function') {
+ // Pass in 'instance' to provide for the value of 'this' in the called function
+ instance[options]();
}
+ } else {
+ instance.start();
}
- };
-
- exports.default = {
- getDefaultConfig: getDefaultConfig,
- unixSeconds: unixSeconds,
- secondsToPrettyTime: secondsToPrettyTime,
- secondsToFormattedTime: secondsToFormattedTime,
- durationTimeToSeconds: durationTimeToSeconds,
- prettyTimeToSeconds: prettyTimeToSeconds,
- setState: setState,
- makeEditable: makeEditable,
- intervalHandler: intervalHandler
- };
-
-/***/ }
-/******/ ]);
\ No newline at end of file
+ });
+};
+} ());
\ No newline at end of file
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index 0de479a..63dc6cc 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-/*! timer.jquery 0.6.4 2017-03-22*/!function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}var e=c(1),f=d(e),g=c(2),h=d(g);!function(){$.fn.timer=function(a){return a=a||"start",this.each(function(){$.data(this,h["default"].PLUGIN_NAME)instanceof f["default"]||$.data(this,h["default"].PLUGIN_NAME,new f["default"](this,a));var b=$.data(this,h["default"].PLUGIN_NAME);"string"==typeof a?"function"==typeof b[a]&&b[a]():b.start()})}}()},function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{"default":a}}function e(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(b,"__esModule",{value:!0});var f=function(){function a(a,b){for(var c=0;c0&&void 0!==arguments[0]?arguments[0]:0,b=Math.floor(a/60);return{days:a>=f["default"].DAYINSECONDS?Math.floor(a/f["default"].DAYINSECONDS):0,hours:a>=3600?Math.floor(a%f["default"].DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}},h=function(a){return a=parseInt(a,10),(a<10&&"0")+a},i=function(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}},j=function(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)},k=function(a){var b=g(a);if(b.days)return b.days+":"+h(b.hours)+":"+h(b.minutes)+":"+h(b.seconds);if(b.hours)return b.hours+":"+h(b.minutes)+":"+h(b.seconds);var c="";return c=b.minutes?b.minutes+":"+h(b.seconds)+" min":b.seconds+" sec"},l=function(a,b){for(var c=g(a),d=[{identifier:"%d",value:c.days},{identifier:"%h",value:c.hours},{identifier:"%m",value:c.minutes},{identifier:"%s",value:c.seconds},{identifier:"%g",value:c.totalMinutes},{identifier:"%t",value:c.totalSeconds},{identifier:"%D",value:h(c.days)},{identifier:"%H",value:h(c.hours)},{identifier:"%M",value:h(c.minutes)},{identifier:"%S",value:h(c.seconds)},{identifier:"%G",value:h(c.totalMinutes)},{identifier:"%T",value:h(c.totalSeconds)}],e=0;e0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*f["default"].DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c},o=function(a,b){a.state=b,$(a.element).data("state",b)},p=function(a){$(a.element).on("focus",function(){a.pause()}),$(a.element).on("blur",function(){a.totalSeconds=n($(a.element)[a.html]()),a.resume()})},q=function(a){return a.totalSeconds=j()-a.startTime,a.config.countdown?(a.totalSeconds=a.config.duration-a.totalSeconds,0===a.totalSeconds&&(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.callback(),$(a.element).data("seconds")),void a.render()):(a.render(),void(a.config.duration&&a.totalSeconds>0&&a.totalSeconds%a.config.duration===0&&(a.config.callback&&a.config.callback(),a.config.repeat||(clearInterval(a.intervalId),o(a,f["default"].TIMER_STOPPED),a.config.duration=null))))};b["default"]={getDefaultConfig:i,unixSeconds:j,secondsToPrettyTime:k,secondsToFormattedTime:l,durationTimeToSeconds:m,prettyTimeToSeconds:n,setState:o,makeEditable:p,intervalHandler:q}}]);
\ No newline at end of file
+!function(){function a(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=m.DAYINSECONDS?Math.floor(a/m.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%m.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function b(a){return((a=parseInt(a,10))<10&&"0")+a}function c(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function d(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function e(c){var d=a(c);if(d.days)return d.days+":"+b(d.hours)+":"+b(d.minutes)+":"+b(d.seconds);if(d.hours)return d.hours+":"+b(d.minutes)+":"+b(d.seconds);return d.minutes?d.minutes+":"+b(d.seconds)+" min":d.seconds+" sec"}function f(c,d){for(var e=a(c),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:b(e.days)},{identifier:"%H",value:b(e.hours)},{identifier:"%M",value:b(e.minutes)},{identifier:"%S",value:b(e.seconds)},{identifier:"%G",value:b(e.totalMinutes)},{identifier:"%T",value:b(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*m.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function i(a,b){a.state=b,$(a.element).data("state",b)}function j(a){$(a.element).on("focus",function(){a.pause()}),$(a.element).on("blur",function(){a.totalSeconds=h($(a.element)[a.html]()),a.resume()})}function k(a){if(a.totalSeconds=d()-a.startTime,a.config.countdown)return a.totalSeconds=a.config.duration-a.totalSeconds,0===a.totalSeconds&&(clearInterval(a.intervalId),i(a,m.TIMER_STOPPED),a.config.callback(),$(a.element).data("seconds")),void a.render();a.render(),a.config.duration&&a.totalSeconds>0&&a.totalSeconds%a.config.duration==0&&(a.config.callback&&a.config.callback(),a.config.repeat||(clearInterval(a.intervalId),i(a,m.TIMER_STOPPED),a.config.duration=null))}function l(a,b){if(this.element=a,this.originalConfig=$.extend({},b),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==a.tagName&&"TEXTAREA"!==a.tagName||(this.html="val"),this.config=n.getDefaultConfig(),b.duration&&(b.duration=n.durationTimeToSeconds(b.duration)),"string"!=typeof b&&(this.config=$.extend(this.config,b)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&n.makeEditable(this),this.startTime=n.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=n.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var m={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",DAYINSECONDS:86400},n={getDefaultConfig:c,unixSeconds:d,secondsToPrettyTime:e,secondsToFormattedTime:f,durationTimeToSeconds:g,prettyTimeToSeconds:h,setState:i,makeEditable:j,intervalHandler:k};l.prototype.start=function(){this.state!==m.TIMER_RUNNING&&(n.setState(this,m.TIMER_RUNNING),this.render(),this.intervalId=setInterval(n.intervalHandler.bind(null,this),this.config.updateFrequency))},l.prototype.pause=function(){this.state===m.TIMER_RUNNING&&(n.setState(this,m.TIMER_PAUSED),clearInterval(this.intervalId))},l.prototype.resume=function(){this.state===m.TIMER_PAUSED&&(n.setState(this,m.TIMER_RUNNING),this.config.countdown?this.startTime=n.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=n.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(n.intervalHandler.bind(null,this),this.config.updateFrequency))},l.prototype.remove=function(){clearInterval(this.intervalId),$(this.element).data(m.PLUGIN_NAME,null),$(this.element).data("seconds",null)},l.prototype.reset=function(){var a=this.originalConfig;this.remove(),$(this.element).timer(a)},l.prototype.render=function(){this.config.format?$(this.element)[this.html](n.secondsToFormattedTime(this.totalSeconds,this.config.format)):$(this.element)[this.html](n.secondsToPrettyTime(this.totalSeconds)),$(this.element).data("seconds",this.totalSeconds)},$.fn.timer=function(a){return a=a||"start",this.each(function(){$.data(this,m.PLUGIN_NAME)instanceof l||$.data(this,m.PLUGIN_NAME,new l(this,a));var b=$.data(this,m.PLUGIN_NAME);"string"==typeof a?"function"==typeof b[a]&&b[a]():b.start()})}}();
\ No newline at end of file
diff --git a/index.html b/index.html
deleted file mode 100644
index a63f8cc..0000000
--- a/index.html
+++ /dev/null
@@ -1,365 +0,0 @@
-
-
-
- jQuery timer plugin | Start an editable pretty timer inside any HTML element
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
jQuery Timer
-
-
Lightweight, well tested jQuery pretty timer plugin
-
Start, Pause, Resume and Remove a timer inside any HTML element.
-
Get notified at a set time or at regular intervals.
Download the jQuery timer plugin and put it in a SCRIPT tag in your HTML page after jQuery itself.
-
-
Start a timer:
-
-
$('#divId').timer(); //Same as $('#divId').timer('start')
-
-
Start at a particular time:
-
-
$('#divId').timer({
- seconds: 100 //Specify start time in seconds
-});
-
-
Pause:
-
-
$('#divId').timer('pause');
-
-
Resume:
-
-
$('#divId').timer('resume');
-
-
Remove Timer:
-
-
$('#divId').timer('remove');
-
-
Get number of seconds:
-
-
$('#divId').data('seconds');
-
-
Get notified:
-
-
-//start a timer & execute a function in 5 minutes & 30 seconds
-$('#divId').timer({
- duration: '5m30s',
- callback: function() {
- alert('Time up!');
- }
-});
-
-
-
Get notified repeatedly:
-
-
-//start a timer & execute a function every 2 minutes
-$('#divId').timer({
- duration: '2m',
- callback: function() {
- alert('Why, Hello there');
- },
- repeat: true //repeatedly calls the callback you specify
-});
-
-
-
Repeat callback & reset timer:
-
-
-//start a timer & execute a function every 30 seconds and then reset the timer at the end of 30 seconds.
-$('#divId').timer({
- duration: '30s',
- callback: function() {
- console.log('Timer will reset!');
- $('#divId').timer('reset');
- },
- repeat: true //repeatedly call the callback
-});
-
-
-
- Format:
- By default the timer will display a pretty output (30 sec OR 1:06). You can change this format if you like.
-
-
-
// Show a digital timer instead of pretty timer:
-$('#divId').timer({
- format: '%H:%M:%S' Display time as 00:00:00
-});
-
-// OR
-$('#divId').timer({
- format: '%h:%m:%s' Display time as 0:0:0
-});
-
-// OR
-$('#divId').timer({
- format: '%M minutes %s seconds' Display time as 3 minutes 45 seconds
-});
-
-
-
Update frequency: By default the timer display updates every 500ms to show an accurate update of time. You can change this by specifying the update frequency in milliseconds.
-
-
$('#divId').timer({
- updateFrequency: 2000 // Update the timer display every 2 seconds.
-});
").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
+//# sourceMappingURL=jquery.min.map
\ No newline at end of file
diff --git a/test/timedFuncSpec.js b/test/timedFuncSpec.js
new file mode 100644
index 0000000..62bac94
--- /dev/null
+++ b/test/timedFuncSpec.js
@@ -0,0 +1,99 @@
+describe('Timed functions', function () {
+ beforeEach(function() {
+ setFixtures('');
+ });
+
+ // Start a timer in a DIV
+ describe('Start a timer in a DIV', function() {
+ var timeElapsed = 0;
+ beforeEach(function (done) {
+ $('#timer').timer();
+ setTimeout(done, 1000);
+ });
+
+ it('Should be true if the async call has completed', function () {
+ expect($('#timer').data('seconds')).toEqual(1);
+ });
+ });
+
+ // Start timer in an INPUT element
+ describe('Start a timer in a INPUT element', function() {
+ beforeEach(function (done) {
+ setFixtures('');
+ $('#inputTimer').timer();
+ setTimeout(done, 1000);
+ });
+
+ it('Should be true if the async call has completed', function () {
+ expect($('#inputTimer').data('seconds')).toEqual(1);
+ });
+ });
+
+ // Pause a timer
+ describe('Pause a running timer', function() {
+ beforeEach(function (done) {
+ $('#timer').timer();
+ $('#timer').timer('pause');
+ setTimeout(done, 1000);
+ });
+
+ it('Should be true if the async call has completed', function () {
+ // Even when we wait for a second, the time elapsed shouldnt change
+ // as we had immediately paused the timer after starting it
+ expect($('#timer').data('seconds')).toEqual(0);
+ });
+ });
+
+ // Pause and Resume a timer
+ describe('Pause and Resume a timer', function() {
+ beforeEach(function (done) {
+ $('#timer').timer();
+ $('#timer').timer('pause');
+ expect($('#timer').data('state')).toBe('paused');
+ setTimeout(done, 1000);
+ });
+
+ it('Should be true if the async call has completed', function () {
+ $('#timer').timer('resume');
+ expect($('#timer').data('state')).toBe('running');
+ });
+ });
+
+ // Execute a function after a set time
+ describe('Execute a function after a set time', function() {
+ var flag;
+ beforeEach(function (done) {
+ $('#timer').timer({
+ callback: function() {
+ flag = true;
+ },
+ duration: 1
+ });
+ setTimeout(done, 1000);
+ });
+
+ it('Should call a function after the provided duration is complete', function () {
+ expect(flag).toBe(true);
+ });
+ });
+
+ // Execute a function after a set time
+ describe('Execute a function after a set time provided in pretty syntax', function() {
+ var flag;
+ beforeEach(function (done) {
+ $('#timer').timer({
+ callback: function() {
+ flag = true;
+ },
+ seconds: 99,
+ duration: '1m40s' // Expects callback to be executed in 100 seconds
+ });
+ setTimeout(done, 1000);
+ });
+
+ it('Should call a function after the provided duration is complete', function () {
+ expect(flag).toBe(true);
+ expect($('#timer')).toContainText('1:40 min');
+ });
+ });
+});
From 3820c5892af019ffb5dce160b3e897a7d3b12f3b Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Sun, 16 Apr 2017 09:35:00 -0700
Subject: [PATCH 05/15] Fix test target
---
.travis.yml | 3 ---
package.json | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9e91ce9..36e4353 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
language: node_js
node_js:
- - "0.10"
- - "0.12"
- "4"
- - "5"
- "6"
\ No newline at end of file
diff --git a/package.json b/package.json
index f8b768d..b0e310a 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"url": "git://github.com/walmik/timer.jquery.git"
},
"scripts": {
- "test": "./node_modules/.bin/tape ./test/*.js",
+ "test": "./node_modules/.bin/tape ./test/utils-test.js",
"build": "./node_modules/.bin/grunt",
"watch": "./node_modules/.bin/grunt watch",
"karma": "./node_modules/.bin/karma start"
From e47143d857c33751ed6f975f56c1d8d1538a73d2 Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Sun, 16 Apr 2017 09:49:21 -0700
Subject: [PATCH 06/15] Update CDNjs link
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 36cd468..162b3aa 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
Load the plugin in a script tag (right after loading jQuery) directly from CDNjs using this URL,
```html
-https://cdnjs.cloudflare.com/ajax/libs/timer.jquery/0.6.5/timer.jquery.min.js
+https://cdnjs.cloudflare.com/ajax/libs/timer.jquery/0.7.0/timer.jquery.js
```
If you are using bower,
From ba060eaa86a77786d85ccf1eef66865ae951d566 Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Wed, 27 Sep 2017 09:36:06 -0700
Subject: [PATCH 07/15] Fix issue #79 & jscs
---
Gruntfile.js | 8 ++++----
dist/timer.jquery.js | 6 +++---
dist/timer.jquery.min.js | 2 +-
package.json | 2 +-
test/timedFuncSpec.js | 32 ++++++++++++++++----------------
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index e1a15cb..688e29e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,20 +4,20 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),
jscs: {
- src: ['Gruntfile.js', 'src/*.js', 'test/*.js']
+ src: ['Gruntfile.js', 'src/*.js', 'test/utils-test.js', 'test/basicTimerSpec', 'test/timedFuncSpec.js']
},
jshint: {
- all: ['Gruntfile.js', 'src/*.js', 'test/*.js']
+ all: ['Gruntfile.js', 'src/*.js', 'test/utils-test.js', 'test/basicTimerSpec', 'test/timedFuncSpec.js']
},
concat: {
options: {
banner: [
'/*! <%= pkg.name %> <%= pkg.version %> <%=grunt.template.today("yyyy-mm-dd")%>*/\n',
- '(function() {\n'
+ '(function($) {\n'
].join(''),
- footer: '} ());'
+ footer: '} (jQuery));'
},
dist: {
src: [
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index 61c52d3..0a6e81b 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -1,5 +1,5 @@
-/*! timer.jquery 0.7.0 2017-04-15*/
-(function() {
+/*! timer.jquery 0.7.1 2017-09-27*/
+(function($) {
var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
@@ -421,4 +421,4 @@ $.fn.timer = function(options) {
}
});
};
-} ());
\ No newline at end of file
+} (jQuery));
\ No newline at end of file
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index 63dc6cc..7fa6953 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-!function(){function a(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=m.DAYINSECONDS?Math.floor(a/m.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%m.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function b(a){return((a=parseInt(a,10))<10&&"0")+a}function c(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function d(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function e(c){var d=a(c);if(d.days)return d.days+":"+b(d.hours)+":"+b(d.minutes)+":"+b(d.seconds);if(d.hours)return d.hours+":"+b(d.minutes)+":"+b(d.seconds);return d.minutes?d.minutes+":"+b(d.seconds)+" min":d.seconds+" sec"}function f(c,d){for(var e=a(c),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:b(e.days)},{identifier:"%H",value:b(e.hours)},{identifier:"%M",value:b(e.minutes)},{identifier:"%S",value:b(e.seconds)},{identifier:"%G",value:b(e.totalMinutes)},{identifier:"%T",value:b(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*m.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function i(a,b){a.state=b,$(a.element).data("state",b)}function j(a){$(a.element).on("focus",function(){a.pause()}),$(a.element).on("blur",function(){a.totalSeconds=h($(a.element)[a.html]()),a.resume()})}function k(a){if(a.totalSeconds=d()-a.startTime,a.config.countdown)return a.totalSeconds=a.config.duration-a.totalSeconds,0===a.totalSeconds&&(clearInterval(a.intervalId),i(a,m.TIMER_STOPPED),a.config.callback(),$(a.element).data("seconds")),void a.render();a.render(),a.config.duration&&a.totalSeconds>0&&a.totalSeconds%a.config.duration==0&&(a.config.callback&&a.config.callback(),a.config.repeat||(clearInterval(a.intervalId),i(a,m.TIMER_STOPPED),a.config.duration=null))}function l(a,b){if(this.element=a,this.originalConfig=$.extend({},b),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==a.tagName&&"TEXTAREA"!==a.tagName||(this.html="val"),this.config=n.getDefaultConfig(),b.duration&&(b.duration=n.durationTimeToSeconds(b.duration)),"string"!=typeof b&&(this.config=$.extend(this.config,b)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&n.makeEditable(this),this.startTime=n.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=n.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var m={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",DAYINSECONDS:86400},n={getDefaultConfig:c,unixSeconds:d,secondsToPrettyTime:e,secondsToFormattedTime:f,durationTimeToSeconds:g,prettyTimeToSeconds:h,setState:i,makeEditable:j,intervalHandler:k};l.prototype.start=function(){this.state!==m.TIMER_RUNNING&&(n.setState(this,m.TIMER_RUNNING),this.render(),this.intervalId=setInterval(n.intervalHandler.bind(null,this),this.config.updateFrequency))},l.prototype.pause=function(){this.state===m.TIMER_RUNNING&&(n.setState(this,m.TIMER_PAUSED),clearInterval(this.intervalId))},l.prototype.resume=function(){this.state===m.TIMER_PAUSED&&(n.setState(this,m.TIMER_RUNNING),this.config.countdown?this.startTime=n.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=n.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(n.intervalHandler.bind(null,this),this.config.updateFrequency))},l.prototype.remove=function(){clearInterval(this.intervalId),$(this.element).data(m.PLUGIN_NAME,null),$(this.element).data("seconds",null)},l.prototype.reset=function(){var a=this.originalConfig;this.remove(),$(this.element).timer(a)},l.prototype.render=function(){this.config.format?$(this.element)[this.html](n.secondsToFormattedTime(this.totalSeconds,this.config.format)):$(this.element)[this.html](n.secondsToPrettyTime(this.totalSeconds)),$(this.element).data("seconds",this.totalSeconds)},$.fn.timer=function(a){return a=a||"start",this.each(function(){$.data(this,m.PLUGIN_NAME)instanceof l||$.data(this,m.PLUGIN_NAME,new l(this,a));var b=$.data(this,m.PLUGIN_NAME);"string"==typeof a?"function"==typeof b[a]&&b[a]():b.start()})}}();
\ No newline at end of file
+!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")),void b.render();b.render(),b.config.duration&&b.totalSeconds>0&&b.totalSeconds%b.config.duration==0&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
diff --git a/package.json b/package.json
index b0e310a..e270c6c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.7.0",
+ "version": "0.7.1",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
diff --git a/test/timedFuncSpec.js b/test/timedFuncSpec.js
index 62bac94..d242514 100644
--- a/test/timedFuncSpec.js
+++ b/test/timedFuncSpec.js
@@ -1,4 +1,4 @@
-describe('Timed functions', function () {
+describe('Timed functions', function() {
beforeEach(function() {
setFixtures('');
});
@@ -6,38 +6,38 @@ describe('Timed functions', function () {
// Start a timer in a DIV
describe('Start a timer in a DIV', function() {
var timeElapsed = 0;
- beforeEach(function (done) {
- $('#timer').timer();
+ beforeEach(function(done) {
+ $('#timer').timer();
setTimeout(done, 1000);
});
- it('Should be true if the async call has completed', function () {
+ it('Should be true if the async call has completed', function() {
expect($('#timer').data('seconds')).toEqual(1);
});
});
// Start timer in an INPUT element
describe('Start a timer in a INPUT element', function() {
- beforeEach(function (done) {
+ beforeEach(function(done) {
setFixtures('');
- $('#inputTimer').timer();
+ $('#inputTimer').timer();
setTimeout(done, 1000);
});
- it('Should be true if the async call has completed', function () {
+ it('Should be true if the async call has completed', function() {
expect($('#inputTimer').data('seconds')).toEqual(1);
});
});
// Pause a timer
describe('Pause a running timer', function() {
- beforeEach(function (done) {
+ beforeEach(function(done) {
$('#timer').timer();
- $('#timer').timer('pause');
+ $('#timer').timer('pause');
setTimeout(done, 1000);
});
- it('Should be true if the async call has completed', function () {
+ it('Should be true if the async call has completed', function() {
// Even when we wait for a second, the time elapsed shouldnt change
// as we had immediately paused the timer after starting it
expect($('#timer').data('seconds')).toEqual(0);
@@ -46,14 +46,14 @@ describe('Timed functions', function () {
// Pause and Resume a timer
describe('Pause and Resume a timer', function() {
- beforeEach(function (done) {
+ beforeEach(function(done) {
$('#timer').timer();
$('#timer').timer('pause');
expect($('#timer').data('state')).toBe('paused');
setTimeout(done, 1000);
});
- it('Should be true if the async call has completed', function () {
+ it('Should be true if the async call has completed', function() {
$('#timer').timer('resume');
expect($('#timer').data('state')).toBe('running');
});
@@ -62,7 +62,7 @@ describe('Timed functions', function () {
// Execute a function after a set time
describe('Execute a function after a set time', function() {
var flag;
- beforeEach(function (done) {
+ beforeEach(function(done) {
$('#timer').timer({
callback: function() {
flag = true;
@@ -72,7 +72,7 @@ describe('Timed functions', function () {
setTimeout(done, 1000);
});
- it('Should call a function after the provided duration is complete', function () {
+ it('Should call a function after the provided duration is complete', function() {
expect(flag).toBe(true);
});
});
@@ -80,7 +80,7 @@ describe('Timed functions', function () {
// Execute a function after a set time
describe('Execute a function after a set time provided in pretty syntax', function() {
var flag;
- beforeEach(function (done) {
+ beforeEach(function(done) {
$('#timer').timer({
callback: function() {
flag = true;
@@ -91,7 +91,7 @@ describe('Timed functions', function () {
setTimeout(done, 1000);
});
- it('Should call a function after the provided duration is complete', function () {
+ it('Should call a function after the provided duration is complete', function() {
expect(flag).toBe(true);
expect($('#timer')).toContainText('1:40 min');
});
From 2f7df3d0a630130b6faae2943e72f8be6ecfc547 Mon Sep 17 00:00:00 2001
From: Chris Colborne
Date: Sun, 26 Nov 2017 23:40:27 +1000
Subject: [PATCH 08/15] Update README.md to include editable option
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 162b3aa..69b4d38 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,8 @@ $("#div-id").timer({
duration: {String}, // The time to countdown from. `seconds` and `duration` are mutually exclusive
callback: {Function}, // If duration is set, this function is called after `duration` has elapsed
repeat: {Bool}, // If duration is set, `callback` will be called repeatedly
- format: {String} // Format to show time in
+ format: {String}, // Format to show time in
+ editable: {Bool} // If click and edit time is enabled
});
```
From 2aadb66dccb5970680214b6d55478de3ac1b6531 Mon Sep 17 00:00:00 2001
From: Matthew
Date: Thu, 27 Sep 2018 21:47:13 +1000
Subject: [PATCH 09/15] Added data state 'removed' (#84)
* Added data state 'removed'
Added a new state which is set when a timer is removed. Previously removing the timer did not update the data state - It would still report the previous timer state despite being removed.
* Missing constant in min.js
Had missed adding the new constant TIMER_REMOVED to min.js version
* Update package.json version number
---
README.md | 2 +-
dist/timer.jquery.js | 2 ++
dist/timer.jquery.min.js | 2 +-
package.json | 2 +-
src/Timer.js | 1 +
src/constants.js | 1 +
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 69b4d38..93f2117 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ $('#div-id').timer({
You can get the current state of timer by querying the `state` property on it's data object
```javascript
-$('#div-id').data('state'); // running | paused | stopped
+$('#div-id').data('state'); // running | paused | stopped | removed
```
##### Duration Syntax
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index 0a6e81b..b8c2c8b 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -4,6 +4,7 @@ var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
+ TIMER_REMOVED: 'removed',
DAYINSECONDS: 86400
};
@@ -369,6 +370,7 @@ Timer.prototype.resume = function() {
Timer.prototype.remove = function() {
clearInterval(this.intervalId);
+ utils.setState(this, Constants.TIMER_REMOVED);
$(this.element).data(Constants.PLUGIN_NAME, null);
$(this.element).data('seconds', null);
};
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index 7fa6953..db5f275 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")),void b.render();b.render(),b.config.duration&&b.totalSeconds>0&&b.totalSeconds%b.config.duration==0&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
+!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")),void b.render();b.render(),b.config.duration&&b.totalSeconds>0&&b.totalSeconds%b.config.duration==0&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),o.setState(this,n.TIMER_REMOVED),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
diff --git a/package.json b/package.json
index e270c6c..a4f6890 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.7.1",
+ "version": "0.8.0",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
diff --git a/src/Timer.js b/src/Timer.js
index 76166be..5119ace 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -85,6 +85,7 @@ Timer.prototype.resume = function() {
Timer.prototype.remove = function() {
clearInterval(this.intervalId);
+ utils.setState(this, Constants.TIMER_REMOVED);
$(this.element).data(Constants.PLUGIN_NAME, null);
$(this.element).data('seconds', null);
};
diff --git a/src/constants.js b/src/constants.js
index 31a63fd..64f1472 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,5 +2,6 @@ var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
+ TIMER_REMOVED: 'removed',
DAYINSECONDS: 86400
};
From 50ffc315925287396361ec4941b4ec75c309d38b Mon Sep 17 00:00:00 2001
From: Nick <32971513+Psychosynthesis@users.noreply.github.com>
Date: Mon, 26 Nov 2018 20:48:05 +0300
Subject: [PATCH 10/15] Adding new parameter (#85)
* Adding new parameter
* Adding new parameter
---
README.md | 1 +
src/Timer.js | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 93f2117..864df77 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ $("#div-id").timer({
repeat: {Bool}, // If duration is set, `callback` will be called repeatedly
format: {String}, // Format to show time in
editable: {Bool} // If click and edit time is enabled
+ hidden; {Bool} // If true, the timer is not displayed in the selected item.
});
```
diff --git a/src/Timer.js b/src/Timer.js
index 5119ace..bf31aa3 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -59,7 +59,9 @@ function Timer(element, config) {
Timer.prototype.start = function() {
if (this.state !== Constants.TIMER_RUNNING) {
utils.setState(this, Constants.TIMER_RUNNING);
- this.render();
+ if (this.config.hidden !== true) {
+ this.render();
+ }
this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
}
};
From 89ded0f429561a079e8f8f633103ed28eb7600d7 Mon Sep 17 00:00:00 2001
From: Walmik
Date: Mon, 26 Nov 2018 09:49:34 -0800
Subject: [PATCH 11/15] Bump version for feature: hidden
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a4f6890..14c764d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.8.0",
+ "version": "0.9.0",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
From 9b7c862dd6fdf9f918c7228a07dc9a5ff17d0ac9 Mon Sep 17 00:00:00 2001
From: mohitYogi <20014551+mohitYogi@users.noreply.github.com>
Date: Wed, 31 Jul 2019 20:36:57 +0530
Subject: [PATCH 12/15] Updated timer to support continuous run (#1) (#92)
* Updated timer to support continuous run (#1)
* Updated intervalHandler to support continuous run
intervalHandler is updated in order to support continuous timer run, even after duration is completed
* Flag for single call to callback
Flag for single call to callback when timer completes in continuous run.
* Update utils.js
* support continuous Timer run
1. Added stopTimerOnDuration in config to run timer continuously.
2. Updated intervalHandler to support continuous run
3. Added Flag isCallbackCalled to stop multiple calls to callback after reaching the duration in continuous run.
* Updates after review.
1. Removed stopTimerOnDuration flag (repeat flag do the same.)
2. Removed isCallbackCalled flag, as suggested after commit review.
* Update after Review
Removed flag isCallbackCalled. (Not required).
* Updates after review
1. Removed stopTimerOnDuration flag (repeat flag do the same.)
2. Removed isCallbackCalled flag, as suggested after commit review.
* Updates after Review
1. Removed stopTimerOnDuration flag (repeat flag do the same.)
2. Removed isCallbackCalled flag, as suggested after commit review.
* Patch version
New rule for checking timer duration completed.
* Update timer.jquery.js
* Semicolon & Comment update
Added missing semi colon. Updated Comment.
* Removed & Updated Comment
---
dist/timer.jquery.js | 10 ++++++----
dist/timer.jquery.min.js | 2 +-
package.json | 2 +-
src/Timer.js | 1 +
src/utils.js | 10 ++++++----
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index b8c2c8b..068431e 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -62,7 +62,7 @@ function getDefaultConfig() {
repeat: false, // This will repeat callback every n times duration is elapsed
countdown: false, // If true, this will render the timer as a countdown (must have duration)
format: null, // This sets the format in which the time will be printed
- updateFrequency: 500 // How often should timer display update
+ updateFrequency: 500, // How often should timer display update
};
}
@@ -250,15 +250,16 @@ function intervalHandler(timerInstance) {
}
timerInstance.render();
+
if (!timerInstance.config.duration) {
return;
}
// If the timer was called with a duration parameter,
- // run the callback if duration is complete
+ // run the callback if duration is complete or total seconds is more than duration
// and remove the duration if `repeat` is not requested
if (timerInstance.totalSeconds > 0 &&
- timerInstance.totalSeconds % timerInstance.config.duration === 0) {
+ (timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
if (timerInstance.config.callback) {
timerInstance.config.callback();
}
@@ -293,6 +294,7 @@ function Timer(element, config) {
this.originalConfig = $.extend({}, config);
this.totalSeconds = 0;
this.intervalId = null;
+
// A HTML element will have the html() method in jQuery to inject content,
this.html = 'html';
if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
@@ -423,4 +425,4 @@ $.fn.timer = function(options) {
}
});
};
-} (jQuery));
\ No newline at end of file
+} (jQuery));
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index db5f275..1e53ab4 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")),void b.render();b.render(),b.config.duration&&b.totalSeconds>0&&b.totalSeconds%b.config.duration==0&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),o.setState(this,n.TIMER_REMOVED),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
+!function(n){var a={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400};function s(t){var e;return t=t||0,e=Math.floor(t/60),{days:t>=a.DAYINSECONDS?Math.floor(t/a.DAYINSECONDS):0,hours:3600<=t?Math.floor(t%a.DAYINSECONDS/3600):0,totalMinutes:e,minutes:60<=t?Math.floor(t%3600/60):e,seconds:t%60,totalSeconds:t}}function r(t){return((t=parseInt(t,10))<10&&"0")+t}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function i(t){var e,n;return 0t.config.duration)&&(t.config.callback&&t.config.callback(),t.config.repeat||(clearInterval(t.intervalId),o(t,a.TIMER_STOPPED),t.config.duration=null))}};function c(t,e){if(this.element=t,this.originalConfig=n.extend({},e),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==t.tagName&&"TEXTAREA"!==t.tagName||(this.html="val"),this.config=d.getDefaultConfig(),e.duration&&(e.duration=d.durationTimeToSeconds(e.duration)),"string"!=typeof e&&(this.config=n.extend(this.config,e)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&d.makeEditable(this),this.startTime=d.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=d.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}c.prototype.start=function(){this.state!==a.TIMER_RUNNING&&(d.setState(this,a.TIMER_RUNNING),this.render(),this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.pause=function(){this.state===a.TIMER_RUNNING&&(d.setState(this,a.TIMER_PAUSED),clearInterval(this.intervalId))},c.prototype.resume=function(){this.state===a.TIMER_PAUSED&&(d.setState(this,a.TIMER_RUNNING),this.config.countdown?this.startTime=d.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=d.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.remove=function(){clearInterval(this.intervalId),d.setState(this,a.TIMER_REMOVED),n(this.element).data(a.PLUGIN_NAME,null),n(this.element).data("seconds",null)},c.prototype.reset=function(){var t=this.originalConfig;this.remove(),n(this.element).timer(t)},c.prototype.render=function(){this.config.format?n(this.element)[this.html](d.secondsToFormattedTime(this.totalSeconds,this.config.format)):n(this.element)[this.html](d.secondsToPrettyTime(this.totalSeconds)),n(this.element).data("seconds",this.totalSeconds)},n.fn.timer=function(e){return e=e||"start",this.each(function(){n.data(this,a.PLUGIN_NAME)instanceof c||n.data(this,a.PLUGIN_NAME,new c(this,e));var t=n.data(this,a.PLUGIN_NAME);"string"==typeof e?"function"==typeof t[e]&&t[e]():t.start()})}}(jQuery);
diff --git a/package.json b/package.json
index 14c764d..bf4a8d4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.9.0",
+ "version": "0.9.1",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
diff --git a/src/Timer.js b/src/Timer.js
index bf31aa3..680e1c9 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -8,6 +8,7 @@ function Timer(element, config) {
this.originalConfig = $.extend({}, config);
this.totalSeconds = 0;
this.intervalId = null;
+
// A HTML element will have the html() method in jQuery to inject content,
this.html = 'html';
if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
diff --git a/src/utils.js b/src/utils.js
index 04c64f3..4cb8279 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -52,7 +52,7 @@ function getDefaultConfig() {
repeat: false, // This will repeat callback every n times duration is elapsed
countdown: false, // If true, this will render the timer as a countdown (must have duration)
format: null, // This sets the format in which the time will be printed
- updateFrequency: 500 // How often should timer display update
+ updateFrequency: 500, // How often should timer display update
};
}
@@ -227,7 +227,7 @@ function intervalHandler(timerInstance) {
if (timerInstance.config.countdown) {
timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
-
+
if (timerInstance.totalSeconds === 0) {
clearInterval(timerInstance.intervalId);
setState(timerInstance, Constants.TIMER_STOPPED);
@@ -240,15 +240,17 @@ function intervalHandler(timerInstance) {
}
timerInstance.render();
+
if (!timerInstance.config.duration) {
return;
}
// If the timer was called with a duration parameter,
- // run the callback if duration is complete
+ // run the callback if duration is complete or total seconds is more than duration
// and remove the duration if `repeat` is not requested
+
if (timerInstance.totalSeconds > 0 &&
- timerInstance.totalSeconds % timerInstance.config.duration === 0) {
+ (timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
if (timerInstance.config.callback) {
timerInstance.config.callback();
}
From 8147b4b605dc39d8704db4243aef1c3e311ccf02 Mon Sep 17 00:00:00 2001
From: Alan
Date: Fri, 10 Jul 2020 10:12:37 -0400
Subject: [PATCH 13/15] Update README.md (#99)
Let's not send people to an ad-infested abandoned domain name :)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 864df77..86721b8 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
[Demo & Instructions][demo] | [Download][min]
-[demo]: http://jquerytimer.com/
+[demo]: https://walmik.github.io/timer.jquery/
[min]: https://raw.githubusercontent.com/walmik/timer.jquery/master/dist/timer.jquery.min.js
## Getting started
From 2d9582c9e8d97c256850899ccad8cb24a361d38a Mon Sep 17 00:00:00 2001
From: Alan
Date: Wed, 12 May 2021 13:54:41 -0400
Subject: [PATCH 14/15] Update constants.js (#100)
---
src/constants.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/constants.js b/src/constants.js
index 64f1472..c94f6de 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,6 +2,7 @@ var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
+ TIMER_STOPPED: 'stopped',
TIMER_REMOVED: 'removed',
DAYINSECONDS: 86400
};
From 372e68f9b38e5d92a33653d944b34a2f0749eba8 Mon Sep 17 00:00:00 2001
From: Rafael Cossovan
Date: Sun, 15 Dec 2024 16:50:54 -0300
Subject: [PATCH 15/15] Fix callback execution order for regressive countdowns
(#105)
* Fix callback execution order for regressive countdowns.
The timer must reach 0 first, then execute the callback.
* Bump version number.
* Fix broken build (jscs).
* Publish 0.9.2 release.
---
dist/timer.jquery.js | 31 ++++++++++++++++++-------------
dist/timer.jquery.min.js | 2 +-
package.json | 10 +++++-----
src/Timer.js | 2 +-
src/utils.js | 15 ++++++++-------
5 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index 068431e..efdb776 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -1,13 +1,14 @@
-/*! timer.jquery 0.7.1 2017-09-27*/
-(function($) {
+/*! timer.jquery 0.9.2 2024-12-13*/
+(function($) {
var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
+ TIMER_STOPPED: 'stopped',
TIMER_REMOVED: 'removed',
DAYINSECONDS: 86400
};
-
+
/* global Constants:true */
/**
* Private
@@ -62,7 +63,7 @@ function getDefaultConfig() {
repeat: false, // This will repeat callback every n times duration is elapsed
countdown: false, // If true, this will render the timer as a countdown (must have duration)
format: null, // This sets the format in which the time will be printed
- updateFrequency: 500, // How often should timer display update
+ updateFrequency: 500 // How often should timer display update
};
}
@@ -238,19 +239,19 @@ function intervalHandler(timerInstance) {
if (timerInstance.config.countdown) {
timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
+ timerInstance.render();
+
if (timerInstance.totalSeconds === 0) {
clearInterval(timerInstance.intervalId);
setState(timerInstance, Constants.TIMER_STOPPED);
timerInstance.config.callback();
$(timerInstance.element).data('seconds');
}
-
- timerInstance.render();
return;
}
timerInstance.render();
-
+
if (!timerInstance.config.duration) {
return;
}
@@ -258,8 +259,10 @@ function intervalHandler(timerInstance) {
// If the timer was called with a duration parameter,
// run the callback if duration is complete or total seconds is more than duration
// and remove the duration if `repeat` is not requested
+
if (timerInstance.totalSeconds > 0 &&
- (timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
+ (timerInstance.totalSeconds % timerInstance.config.duration === 0 ||
+ timerInstance.totalSeconds > timerInstance.config.duration )) {
if (timerInstance.config.callback) {
timerInstance.config.callback();
}
@@ -283,7 +286,7 @@ var utils = {
makeEditable: makeEditable,
intervalHandler: intervalHandler
};
-
+
/**
* Timer function to initiate a timer on the provided element with the given config.
* @param {Object} element HTML node as passed by jQuery
@@ -294,7 +297,7 @@ function Timer(element, config) {
this.originalConfig = $.extend({}, config);
this.totalSeconds = 0;
this.intervalId = null;
-
+
// A HTML element will have the html() method in jQuery to inject content,
this.html = 'html';
if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
@@ -346,7 +349,9 @@ function Timer(element, config) {
Timer.prototype.start = function() {
if (this.state !== Constants.TIMER_RUNNING) {
utils.setState(this, Constants.TIMER_RUNNING);
- this.render();
+ if (this.config.hidden !== true) {
+ this.render();
+ }
this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
}
};
@@ -391,7 +396,7 @@ Timer.prototype.render = function() {
}
$(this.element).data('seconds', this.totalSeconds);
};
-
+
/* global $:true */
$.fn.timer = function(options) {
options = options || 'start';
@@ -425,4 +430,4 @@ $.fn.timer = function(options) {
}
});
};
-} (jQuery));
+} (jQuery));
\ No newline at end of file
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index 1e53ab4..37bc970 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-!function(n){var a={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400};function s(t){var e;return t=t||0,e=Math.floor(t/60),{days:t>=a.DAYINSECONDS?Math.floor(t/a.DAYINSECONDS):0,hours:3600<=t?Math.floor(t%a.DAYINSECONDS/3600):0,totalMinutes:e,minutes:60<=t?Math.floor(t%3600/60):e,seconds:t%60,totalSeconds:t}}function r(t){return((t=parseInt(t,10))<10&&"0")+t}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function i(t){var e,n;return 0t.config.duration)&&(t.config.callback&&t.config.callback(),t.config.repeat||(clearInterval(t.intervalId),o(t,a.TIMER_STOPPED),t.config.duration=null))}};function c(t,e){if(this.element=t,this.originalConfig=n.extend({},e),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==t.tagName&&"TEXTAREA"!==t.tagName||(this.html="val"),this.config=d.getDefaultConfig(),e.duration&&(e.duration=d.durationTimeToSeconds(e.duration)),"string"!=typeof e&&(this.config=n.extend(this.config,e)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&d.makeEditable(this),this.startTime=d.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=d.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}c.prototype.start=function(){this.state!==a.TIMER_RUNNING&&(d.setState(this,a.TIMER_RUNNING),this.render(),this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.pause=function(){this.state===a.TIMER_RUNNING&&(d.setState(this,a.TIMER_PAUSED),clearInterval(this.intervalId))},c.prototype.resume=function(){this.state===a.TIMER_PAUSED&&(d.setState(this,a.TIMER_RUNNING),this.config.countdown?this.startTime=d.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=d.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.remove=function(){clearInterval(this.intervalId),d.setState(this,a.TIMER_REMOVED),n(this.element).data(a.PLUGIN_NAME,null),n(this.element).data("seconds",null)},c.prototype.reset=function(){var t=this.originalConfig;this.remove(),n(this.element).timer(t)},c.prototype.render=function(){this.config.format?n(this.element)[this.html](d.secondsToFormattedTime(this.totalSeconds,this.config.format)):n(this.element)[this.html](d.secondsToPrettyTime(this.totalSeconds)),n(this.element).data("seconds",this.totalSeconds)},n.fn.timer=function(e){return e=e||"start",this.each(function(){n.data(this,a.PLUGIN_NAME)instanceof c||n.data(this,a.PLUGIN_NAME,new c(this,e));var t=n.data(this,a.PLUGIN_NAME);"string"==typeof e?"function"==typeof t[e]&&t[e]():t.start()})}}(jQuery);
+!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,b.render(),void(0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")));b.render(),b.config.duration&&b.totalSeconds>0&&(b.totalSeconds%b.config.duration==0||b.totalSeconds>b.config.duration)&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_STOPPED:"stopped",TIMER_REMOVED:"removed",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),!0!==this.config.hidden&&this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),o.setState(this,n.TIMER_REMOVED),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
diff --git a/package.json b/package.json
index bf4a8d4..685d83d 100644
--- a/package.json
+++ b/package.json
@@ -2,16 +2,16 @@
"name": "timer.jquery",
"description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.9.1",
+ "version": "0.9.2",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
},
"scripts": {
- "test": "./node_modules/.bin/tape ./test/utils-test.js",
- "build": "./node_modules/.bin/grunt",
- "watch": "./node_modules/.bin/grunt watch",
- "karma": "./node_modules/.bin/karma start"
+ "test": "npx tape ./test/utils-test.js",
+ "build": "npx grunt",
+ "watch": "npx grunt watch",
+ "karma": "npx karma start"
},
"engines": {
"node": "> 0.10.0"
diff --git a/src/Timer.js b/src/Timer.js
index 680e1c9..20418c6 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -8,7 +8,7 @@ function Timer(element, config) {
this.originalConfig = $.extend({}, config);
this.totalSeconds = 0;
this.intervalId = null;
-
+
// A HTML element will have the html() method in jQuery to inject content,
this.html = 'html';
if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
diff --git a/src/utils.js b/src/utils.js
index 4cb8279..9d6fbc2 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -52,7 +52,7 @@ function getDefaultConfig() {
repeat: false, // This will repeat callback every n times duration is elapsed
countdown: false, // If true, this will render the timer as a countdown (must have duration)
format: null, // This sets the format in which the time will be printed
- updateFrequency: 500, // How often should timer display update
+ updateFrequency: 500 // How often should timer display update
};
}
@@ -227,20 +227,20 @@ function intervalHandler(timerInstance) {
if (timerInstance.config.countdown) {
timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
-
+
+ timerInstance.render();
+
if (timerInstance.totalSeconds === 0) {
clearInterval(timerInstance.intervalId);
setState(timerInstance, Constants.TIMER_STOPPED);
timerInstance.config.callback();
$(timerInstance.element).data('seconds');
}
-
- timerInstance.render();
return;
}
timerInstance.render();
-
+
if (!timerInstance.config.duration) {
return;
}
@@ -248,9 +248,10 @@ function intervalHandler(timerInstance) {
// If the timer was called with a duration parameter,
// run the callback if duration is complete or total seconds is more than duration
// and remove the duration if `repeat` is not requested
-
+
if (timerInstance.totalSeconds > 0 &&
- (timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
+ (timerInstance.totalSeconds % timerInstance.config.duration === 0 ||
+ timerInstance.totalSeconds > timerInstance.config.duration )) {
if (timerInstance.config.callback) {
timerInstance.config.callback();
}