Skip to content

Commit 56b1a85

Browse files
committed
Update uglified files and manifest after version bump
1 parent 13b0252 commit 56b1a85

3 files changed

+8
-9
lines changed

jquery.tinytimer.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* tinyTimer jQuery plugin
3-
* version 0.1.3
3+
* version 0.1.4
44
*
55
* Copyright (c) 2013 Michal Wojciechowski (odyniec.net)
66
*
@@ -13,20 +13,19 @@
1313
var tick, tt = this, elem = (tt.options = options).element, ref = new Date(options.from || options.to).getTime(), dir = !!options.from || -1, M = Math, doNothing = function() {};
1414
tt.interval = setInterval(tick = function() {
1515
if (!tt.paused) {
16-
var sec = M.round((Date.now() - ref) * dir / 1e3), val = {
16+
var sec = M.max(M.round((Date.now() - ref) * dir / 1e3), 0), val = {
1717
S: sec,
1818
s: sec % 60,
1919
M: M.floor(sec /= 60),
2020
H: M.floor(sec /= 60),
2121
D: M.floor(sec /= 24)
2222
};
2323
val.m = val.M % 60, val.h = val.H % 24, val.d = val.D, val.text = (options.format || "%-H{:}%0m:%0s").replace(/%(-?)(0?)([dhms])(\s*)(?:\{(.+?)\})?/gi, options.replacer || function(match, omit, zero, part, space, forms) {
24-
var v = val[part], out = (v > 9 ? "" : zero) + v + space;
25-
return forms && ((forms = forms.split("|"))[2] = forms[2] || (forms[1] = forms[1] || forms[0]),
26-
out += forms[+(1 != v) + (1 != v && (2 > v % 10 || v % 10 > 4) || v > 10 && 20 > v)]),
27-
!v && omit ? "" : out;
24+
var v = val[part];
25+
return (forms = (forms || "").split("|"))[2] = forms[2] || (forms[1] = forms[1] || forms[0]),
26+
!v && omit ? "" : (v > 9 ? "" : zero) + v + space + forms[+(1 != v) + (1 != v && (2 > v % 10 || v % 10 > 4) || v > 10 && 20 > v)];
2827
}), elem ? $(elem).html(val.text) : elem = tt, (options.onTick || doNothing).call(elem, tt.val = val),
29-
0 > dir && 0 >= sec && (clearInterval(tt.interval), (options.onEnd || doNothing).call(elem, val));
28+
0 > dir && !sec && (clearInterval(tt.interval), (options.onEnd || doNothing).call(elem, val));
3029
}
3130
}, 1e3), tick(), tt.pause = tt.stop = function() {
3231
tt.paused = Date.now();

jquery.tinytimer.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tinytimer.jquery.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tinytimer",
33
"title": "TinyTimer",
4-
"version": "0.1.3",
4+
"version": "0.1.4",
55
"description": "TinyTimer is a very simple plugin that lets you create a countdown (or countup) timer on a web page.",
66
"keywords": [ "timer", "countdown", "clock" ],
77
"author": {

0 commit comments

Comments
 (0)