Merge branch 'stable'
This commit is contained in:
commit
7d7d0994d6
|
@ -53,6 +53,7 @@ function update() {
|
|||
function startTimer(element, tenths, callback) {
|
||||
var startTime;
|
||||
var running = false;
|
||||
var set_duration = 0;
|
||||
var duration = 0;
|
||||
var className;
|
||||
|
||||
|
@ -72,7 +73,7 @@ function startTimer(element, tenths, callback) {
|
|||
}
|
||||
|
||||
// Has the timer run out?
|
||||
if ((duration > 0) && (remain <= 0)) {
|
||||
if ((set_duration > 0) && (remain <= 0)) {
|
||||
duration = 0;
|
||||
sec = 0;
|
||||
running = false;
|
||||
|
@ -112,6 +113,7 @@ function startTimer(element, tenths, callback) {
|
|||
// Put element into class [cn], if set.
|
||||
element.set = function(t, cn) {
|
||||
startTime = (new Date()).getTime();
|
||||
set_duration = t;
|
||||
duration = t;
|
||||
className = cn;
|
||||
refresh();
|
||||
|
|
Loading…
Reference in New Issue