From a2592d8f0374359874325f43543a25219534ce67 Mon Sep 17 00:00:00 2001
From: Walmik
Date: Tue, 9 Aug 2016 22:54:45 -0700
Subject: [PATCH 01/16] Fixed minified file
---
dist/timer.jquery.min.js | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index b8e11fc..809841d 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-/*! timer.jquery 0.6.1 2016-06-16*/!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),10>a?"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.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
diff --git a/package.json b/package.json
index dadfa43..cd11a2f 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.3",
+ "version": "0.6.4",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
From 1650c3baf51b85912767ddc0ccd20abdc809fbff Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Wed, 22 Mar 2017 05:13:48 -0700
Subject: [PATCH 02/16] 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 04/16] 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.
- Click and edit time while timer is running!
-
-
-
Try it out
-
-
-
-
-
- Start
- Resume
- Pause
- Remove Timer
-
-
-
-
- Download plugin |
- ★ Star this project on Github
-
-
-
-
-
-
How to
-
-
Install:
-
-
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.
-});
-
-
-
-
-
-
- Download jQuery timer plugin
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/package.json b/package.json
index 97c73f4..114fafe 100644
--- a/package.json
+++ b/package.json
@@ -1,36 +1,28 @@
{
"name": "timer.jquery",
- "description": "Start/Stop/Resume/Remove a timer inside any HTML element.",
+ "description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
"author": "Walmik Deshpande",
- "version": "0.6.5",
+ "version": "0.7.0",
"repository": {
"type": "git",
"url": "git://github.com/walmik/timer.jquery.git"
},
"scripts": {
- "eslint": "./node_modules/.bin/eslint src/*.js",
- "tape": "./node_modules/.bin/tape -r babel-register ./test/*.js",
- "test": "npm run eslint && npm run tape",
- "webpack": "./node_modules/.bin/webpack --watch",
- "grunt": "./node_modules/.bin/grunt"
+ "test": "./node_modules/.bin/tape ./test/*.js",
+ "build": "./node_modules/.bin/grunt",
+ "watch": "./node_modules/.bin/grunt watch"
},
"engines": {
- "node": ">= 0.10.0"
- },
- "dependencies": {
- "babel-register": "^6.9.0"
+ "node": "> 0.10.0"
},
"devDependencies": {
- "babel-core": "^6.8.0",
- "babel-loader": "^6.2.4",
- "babel-preset-es2015": "^6.6.0",
- "eslint": "^2.10.2",
- "eslint-config-google": "^0.5.0",
"grunt": "^1.0.1",
- "grunt-contrib-uglify": "^1.0.1",
+ "grunt-contrib-concat": "^1.0.1",
+ "grunt-contrib-jshint": "^1.1.0",
+ "grunt-contrib-uglify": "^2.3.0",
"grunt-contrib-watch": "^1.0.0",
- "tape": "^4.5.1",
- "webpack": "^1.13.0"
+ "grunt-jscs": "^3.0.1",
+ "tape": "^4.5.1"
},
"license": "MIT"
}
diff --git a/src/Timer.js b/src/Timer.js
index 0cb076a..76166be 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -1,118 +1,105 @@
-/* global $:true */
-import Constants from './constants';
-import utils from './utils';
-
/**
- * Timer class to be instantiated on every element.
- * All relative values will be stored at instance level.
+ * 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)
*/
-class Timer {
- /**
- * 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)
- */
- constructor(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);
- }
+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';
+ }
- if (typeof config !== 'string') {
- this.config = $.extend(this.config, config);
- }
+ this.config = utils.getDefaultConfig();
- if (this.config.seconds) {
- this.totalSeconds = this.config.seconds;
- }
+ if (config.duration) {
+ config.duration = utils.durationTimeToSeconds(config.duration);
+ }
- if (this.config.editable) {
- utils.makeEditable(this);
- }
+ if (typeof config !== 'string') {
+ this.config = $.extend(this.config, config);
+ }
- this.startTime = utils.unixSeconds() - this.totalSeconds;
+ if (this.config.seconds) {
+ this.totalSeconds = this.config.seconds;
+ }
- // 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 (this.config.editable) {
+ utils.makeEditable(this);
+ }
- // 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!');
- }
+ this.startTime = utils.unixSeconds() - this.totalSeconds;
- if (this.config.editable) {
- throw new Error('Cannot set editable on a countdown timer!');
- }
- this.config.startTime = utils.unixSeconds() - this.config.duration;
- this.totalSeconds = this.config.duration;
- }
+ // 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;
}
- start() {
- 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);
+ // 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!');
}
- }
- pause() {
- if (this.state === Constants.TIMER_RUNNING) {
- utils.setState(this, Constants.TIMER_PAUSED);
- clearInterval(this.intervalId);
+ if (this.config.editable) {
+ throw new Error('Cannot set editable on a countdown timer!');
}
+ this.config.startTime = utils.unixSeconds() - this.config.duration;
+ this.totalSeconds = this.config.duration;
}
+}
- resume() {
- 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;
- }
- this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
- }
+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);
}
+};
- remove() {
+Timer.prototype.pause = function() {
+ if (this.state === Constants.TIMER_RUNNING) {
+ utils.setState(this, Constants.TIMER_PAUSED);
clearInterval(this.intervalId);
- $(this.element).data(Constants.PLUGIN_NAME, null);
}
+};
- reset() {
- let element = this.element;
- let originalConfig = this.originalConfig;
- this.remove();
- $(element).timer(originalConfig);
- }
-
- render() {
- if (this.config.format) {
- $(this.element)[this.html](utils.secondsToFormattedTime(this.totalSeconds, this.config.format));
+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.element)[this.html](utils.secondsToPrettyTime(this.totalSeconds));
+ this.startTime = utils.unixSeconds() - this.totalSeconds;
}
- // Make total seconds available via timer element's data attribute
- $(this.element).data('seconds', this.totalSeconds);
+ this.intervalId = setInterval(utils.intervalHandler.bind(null, this), this.config.updateFrequency);
}
-}
-
-export default Timer;
+};
+
+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);
+};
diff --git a/src/constants.js b/src/constants.js
index 13f3405..31a63fd 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,8 +1,6 @@
-const Constants = {
+var Constants = {
PLUGIN_NAME: 'timer',
TIMER_RUNNING: 'running',
TIMER_PAUSED: 'paused',
DAYINSECONDS: 86400
};
-
-export default Constants;
diff --git a/src/index.js b/src/index.js
index 5d5d781..ccfe6d0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,40 +1,33 @@
/* global $:true */
+$.fn.timer = function(options) {
+ options = options || 'start';
-import Timer from './Timer';
-import Constants from './constants';
-(function() {
- $.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));
- }
-
+ return this.each(function() {
+ if (!($.data(this, Constants.PLUGIN_NAME) instanceof Timer)) {
/**
- * Use the instance of this plugin derived from the data attribute for this element
- * to conduct whatever action requested as a string parameter.
+ * 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
*/
- var instance = $.data(this, Constants.PLUGIN_NAME);
+ $.data(this, Constants.PLUGIN_NAME, new Timer(this, options));
+ }
- /**
- * 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();
+ /**
+ * 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);
+
+ /**
+ * 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();
+ }
+ });
+};
diff --git a/src/utils.js b/src/utils.js
index bbacbf0..04c64f3 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,5 +1,4 @@
-/* global $:true */
-import Constants from './constants';
+/* global Constants:true */
/**
* Private
* Convert (a number) seconds to a Object with days, hours, minutes etc as properties
@@ -7,8 +6,10 @@ import Constants from './constants';
* @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
*/
-const _secondsToTimeObj = (totalSeconds = 0) => {
- let totalMinutes = Math.floor(totalSeconds / 60);
+function _secondsToTimeObj(totalSeconds) {
+ var totalMinutes;
+ totalSeconds = totalSeconds || 0;
+ totalMinutes = Math.floor(totalSeconds / 60);
return {
days: totalSeconds >= Constants.DAYINSECONDS ?
Math.floor(totalSeconds / Constants.DAYINSECONDS) :
@@ -16,14 +17,14 @@ const _secondsToTimeObj = (totalSeconds = 0) => {
hours: totalSeconds >= 3600 ?
Math.floor(totalSeconds % Constants.DAYINSECONDS / 3600) :
0,
- totalMinutes,
+ totalMinutes: totalMinutes,
minutes: totalSeconds >= 60 ?
Math.floor(totalSeconds % 3600 / 60) :
totalMinutes,
seconds: totalSeconds % 60,
- totalSeconds
+ totalSeconds: totalSeconds
};
-};
+}
/**
* Private
@@ -31,32 +32,36 @@ const _secondsToTimeObj = (totalSeconds = 0) => {
* @param {Number} num The number to be padded
* @return {String|Number} Padded (if less than 10) number
*/
-const _paddedValue = num => {
+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
*/
-const getDefaultConfig = () => ({
- 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
-});
+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
*/
-const unixSeconds = () => Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
+function unixSeconds() {
+ return Math.round((Date.now ? Date.now() : new Date().getTime()) / 1000);
+}
/**
* Convert seconds to pretty time.
@@ -64,8 +69,8 @@ const unixSeconds = () => Math.round((Date.now ? Date.now() : new Date().getTime
* @param {Number} seconds Seconds to be converted
* @return {String} Pretty time
*/
-const secondsToPrettyTime = seconds => {
- let timeObj = _secondsToTimeObj(seconds);
+function secondsToPrettyTime(seconds) {
+ var timeObj = _secondsToTimeObj(seconds);
if (timeObj.days) {
return timeObj.days + ':' + _paddedValue(timeObj.hours) + ':' +
@@ -73,10 +78,12 @@ const secondsToPrettyTime = seconds => {
}
if (timeObj.hours) {
- return timeObj.hours + ':' + _paddedValue(timeObj.minutes) + ':' + _paddedValue(timeObj.seconds);
+ return timeObj.hours +
+ ':' + _paddedValue(timeObj.minutes) +
+ ':' + _paddedValue(timeObj.seconds);
}
- let prettyTime = '';
+ var prettyTime = '';
if (timeObj.minutes) {
prettyTime = timeObj.minutes + ':' + _paddedValue(timeObj.seconds) + ' min';
} else {
@@ -84,7 +91,7 @@ const secondsToPrettyTime = seconds => {
}
return prettyTime;
-};
+}
/**
* Convert seconds to user defined format for time
@@ -92,9 +99,9 @@ const secondsToPrettyTime = seconds => {
* @param {String} formattedTime User defined format
* @return {String} Formatted time string
*/
-const secondsToFormattedTime = (seconds, formattedTime) => {
- let timeObj = _secondsToTimeObj(seconds);
- const formatDef = [
+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},
@@ -110,35 +117,34 @@ const secondsToFormattedTime = (seconds, formattedTime) => {
];
// Use `for` loop to support ie8 after transpilation
- for (let i = 0; i < formatDef.length; i++) {
+ 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
*/
-const durationTimeToSeconds = timeFormat => {
+function durationTimeToSeconds(timeFormat) {
if (!isNaN(Number(timeFormat))) {
- // A number was passed
- return timeFormat;
+ return timeFormat; // A number was passed
}
timeFormat = timeFormat.toLowerCase();
- 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
+ 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!');
}
- let seconds = 0;
+ var seconds = 0;
if (days) {
seconds += Number(days[0].replace('d', '')) * Constants.DAYINSECONDS;
}
@@ -155,7 +161,7 @@ const durationTimeToSeconds = timeFormat => {
seconds += Number(secs[0].replace('s', ''));
}
return seconds;
-};
+}
/**
* Parse pretty time and return it as seconds
@@ -163,9 +169,8 @@ const durationTimeToSeconds = timeFormat => {
* @param {String} editedTime The time as edited by the user
* @return {Number} Parsed time
*/
-const prettyTimeToSeconds = editedTime => {
- let arr;
- let time;
+function prettyTimeToSeconds(editedTime) {
+ var arr, time;
if (editedTime.indexOf('sec') > 0) {
time = Number(editedTime.replace(/\ssec/g, ''));
@@ -183,39 +188,41 @@ const prettyTimeToSeconds = editedTime => {
}
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
*/
-const setState = (timerInstance, newState) => {
+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
*/
-const makeEditable = timerInstance => {
- $(timerInstance.element).on('focus', () => {
+function makeEditable(timerInstance) {
+ $(timerInstance.element).on('focus', function() {
timerInstance.pause();
});
- $(timerInstance.element).on('blur', () => {
- timerInstance.totalSeconds = prettyTimeToSeconds($(timerInstance.element)[timerInstance.html]());
+ $(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
*/
-const intervalHandler = timerInstance => {
+function intervalHandler(timerInstance) {
timerInstance.totalSeconds = unixSeconds() - timerInstance.startTime;
if (timerInstance.config.countdown) {
@@ -240,7 +247,8 @@ const intervalHandler = timerInstance => {
// 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.totalSeconds > 0 &&
+ timerInstance.totalSeconds % timerInstance.config.duration === 0) {
if (timerInstance.config.callback) {
timerInstance.config.callback();
}
@@ -251,9 +259,9 @@ const intervalHandler = timerInstance => {
timerInstance.config.duration = null;
}
}
-};
+}
-export default {
+var utils = {
getDefaultConfig: getDefaultConfig,
unixSeconds: unixSeconds,
secondsToPrettyTime: secondsToPrettyTime,
diff --git a/test/utils-test.js b/test/utils-test.js
index 900c8b9..600dd33 100644
--- a/test/utils-test.js
+++ b/test/utils-test.js
@@ -1,13 +1,19 @@
-import test from 'tape';
-import utils from '../src/utils.js';
+var test = require('tape');
+var fs = require('fs');
-test('test unixSeconds', (t) => {
+// Load utils and constants in the global scope of this file to run tests on:
+/* jshint ignore:start */
+eval(fs.readFileSync(__dirname + '/../src/constants.js') + '');
+eval(fs.readFileSync(__dirname + '/../src/utils.js') + '');
+/* jshint ignore:end */
+
+test('test unixSeconds', function(t) {
t.equal(utils.unixSeconds(), Math.round(Date.now() / 1000));
t.end();
});
-test('test getDefaultConfig', (t) => {
- let config = utils.getDefaultConfig();
+test('test getDefaultConfig', function(t) {
+ var config = utils.getDefaultConfig();
t.equal(config.seconds, 0);
t.equal(config.duration, null);
t.equal(config.editable, false);
@@ -17,7 +23,7 @@ test('test getDefaultConfig', (t) => {
t.end();
});
-test('test secondsToFormattedTime', (t) => {
+test('test secondsToFormattedTime', function(t) {
t.equal(utils.secondsToFormattedTime(100, '%m:%s'), '1:40');
t.equal(utils.secondsToFormattedTime(3, '%m:%s'), '0:3');
t.equal(utils.secondsToFormattedTime(1000, '%M minutes'), '16 minutes');
@@ -32,7 +38,7 @@ test('test secondsToFormattedTime', (t) => {
t.end();
});
-test('test durationTimeToSeconds', (t) => {
+test('test durationTimeToSeconds', function(t) {
t.equal(utils.durationTimeToSeconds(330), 330);
t.equal(utils.durationTimeToSeconds('5m30s'), 330);
t.equal(utils.durationTimeToSeconds('30s'), 30);
@@ -50,7 +56,7 @@ test('test durationTimeToSeconds', (t) => {
t.end();
});
-test('test secondsToPrettyTime', (t) => {
+test('test secondsToPrettyTime', function(t) {
t.equal(utils.secondsToPrettyTime(100), '1:40 min');
t.equal(utils.secondsToPrettyTime(1000), '16:40 min');
t.equal(utils.secondsToPrettyTime(1234), '20:34 min');
@@ -59,7 +65,7 @@ test('test secondsToPrettyTime', (t) => {
t.end();
});
-test('test prettyTimeToSeconds', (t) => {
+test('test prettyTimeToSeconds', function(t) {
t.equal(utils.prettyTimeToSeconds('1:40 min'), 100);
t.equal(utils.prettyTimeToSeconds('16:40 min'), 1000);
t.equal(utils.prettyTimeToSeconds('20:34 min'), 1234);
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index d91f421..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = {
- entry: './src/index.js',
- output: {
- path: 'dist',
- filename: 'timer.jquery.js',
- },
- module: {
- loaders: [
- {
- test: /\.js?$/,
- exclude: 'node_modules',
- loader: 'babel', // 'babel-loader' is also a legal name to reference
- query: {
- presets: ['es2015']
- }
- }
- ]
- }
-};
From 7d1be908c1b9683f4f384c9cb8be778d61dba996 Mon Sep 17 00:00:00 2001
From: Walmik Deshpande
Date: Sun, 16 Apr 2017 09:29:08 -0700
Subject: [PATCH 05/16] Add karma tests
---
karma.conf.js | 78 ++++++++++++++++++++++++++++++
package.json | 11 ++++-
test/basicTimerSpec.js | 48 +++++++++++++++++++
test/jquery.1.11.2.min.js | 5 ++
test/timedFuncSpec.js | 99 +++++++++++++++++++++++++++++++++++++++
5 files changed, 240 insertions(+), 1 deletion(-)
create mode 100644 karma.conf.js
create mode 100644 test/basicTimerSpec.js
create mode 100644 test/jquery.1.11.2.min.js
create mode 100644 test/timedFuncSpec.js
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 0000000..dfa9d7e
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,78 @@
+// Karma configuration
+// Generated on Tue Jan 10 2017 20:29:02 GMT-0800 (PST)
+
+module.exports = function(config) {
+ config.set({
+
+ // base path that will be used to resolve all patterns (eg. files, exclude)
+ basePath: '',
+
+
+ // frameworks to use
+ // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+ frameworks: ['jasmine'],
+
+
+ // list of files / patterns to load in the browser
+ files: [
+ 'test/jquery.1.11.2.min.js',
+ 'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
+ 'dist/timer.jquery.js',
+ 'test/basicTimerSpec.js'
+ ],
+
+
+ // list of files to exclude
+ exclude: [
+ ],
+
+
+ // preprocess matching files before serving them to the browser
+ // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+ preprocessors: {
+ },
+
+
+ // test results reporter to use
+ // possible values: 'dots', 'progress'
+ // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+ reporters: ['progress'],
+
+
+ // web server port
+ port: 9876,
+
+
+ // enable / disable colors in the output (reporters and logs)
+ colors: true,
+
+
+ // level of logging
+ // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+ logLevel: config.LOG_INFO,
+
+ browserConsoleLogOptions: {
+ level: 'debug',
+ format: '%b %T: %m',
+ terminal: true
+ },
+
+
+ // enable / disable watching file and executing tests whenever any file changes
+ autoWatch: true,
+
+
+ // start these browsers
+ // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+ browsers: ['Firefox'],
+
+
+ // Continuous Integration mode
+ // if true, Karma captures browsers, runs the tests and exits
+ singleRun: true,
+
+ // Concurrency level
+ // how many browser should be started simultaneous
+ concurrency: Infinity
+ })
+}
diff --git a/package.json b/package.json
index 114fafe..f8b768d 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
"scripts": {
"test": "./node_modules/.bin/tape ./test/*.js",
"build": "./node_modules/.bin/grunt",
- "watch": "./node_modules/.bin/grunt watch"
+ "watch": "./node_modules/.bin/grunt watch",
+ "karma": "./node_modules/.bin/karma start"
},
"engines": {
"node": "> 0.10.0"
@@ -22,6 +23,14 @@
"grunt-contrib-uglify": "^2.3.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-jscs": "^3.0.1",
+ "grunt-karma": "^2.0.0",
+ "jasmine": "^2.5.3",
+ "jasmine-core": "^2.5.2",
+ "jasmine-jquery": "^2.1.1",
+ "karma": "^1.6.0",
+ "karma-firefox-launcher": "^1.0.1",
+ "karma-jasmine": "^1.1.0",
+ "karma-jasmine-jquery": "^0.1.1",
"tape": "^4.5.1"
},
"license": "MIT"
diff --git a/test/basicTimerSpec.js b/test/basicTimerSpec.js
new file mode 100644
index 0000000..efba35c
--- /dev/null
+++ b/test/basicTimerSpec.js
@@ -0,0 +1,48 @@
+describe('Basic functions', function() {
+
+ beforeEach(function() {
+ setFixtures('
');
+ });
+
+ it('should set a timer attribute on the prototype(fn) of $', function() {
+ expect($.fn.timer).toExist();
+ });
+
+ it('allows starting a timer in a given dom element', function() {
+ $('#timer').timer();
+ // The jQuery timer plugin adds a data attribute named 'timer'
+ // to the element on which it is initialized
+ expect($('#timer')).toHaveData('timer');
+ });
+
+ it('allows starting a timer with a given value', function() {
+ $('#timer').timer({
+ seconds: 5
+ });
+ expect($('#timer')).toContainText('5 sec');
+ });
+
+ it('allows starting a timer where a value given in seconds converts to pretty time', function() {
+ $('#timer').timer({
+ seconds: 100
+ });
+ expect($('#timer')).toContainText('1:40 min');
+ });
+
+ it('allows starting a timer with a custom time format', function() {
+ $('#timer').timer({
+ seconds: 100,
+ format: '%H:%M:%S' //Display time as 00:00:00
+ });
+ expect($('#timer')).toContainText('00:01:40');
+ });
+
+ it('allows starting a timer with a custom time format', function() {
+ $('#timer').timer({
+ seconds: 100,
+ format: '%m minutes %s seconds' //Display time as 00:00:00
+ });
+ expect($('#timer')).toContainText('1 minutes 40 seconds');
+ });
+});
+
diff --git a/test/jquery.1.11.2.min.js b/test/jquery.1.11.2.min.js
new file mode 100644
index 0000000..826372a
--- /dev/null
+++ b/test/jquery.1.11.2.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.11.2 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.2",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML=" ",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML=" ","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML=" ",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML=" a ",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML=" ",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""," "],legend:[1,""," "],area:[1,""," "],param:[1,""," "],thead:[1,""],tr:[2,""],col:[2,""],td:[3,""],_default:k.htmlSerialize?[0,"",""]:[1,"X","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("