Skip to content

Commit 2761933

Browse files
committed
Fixed a bug with runner lap returning an object. Closes jylauril#4
1 parent da199f9 commit 2761933

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

lib/expose.coffee

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ if $
1515
when 'init' then new Runner(@, options, start)
1616
when 'info' then return runner.info() if runner
1717
when 'reset' then runner.reset(options) if runner
18-
when 'start', 'stop', 'toggle', 'lap' then runner[method]() if runner
18+
when 'lap' then return runner.lap() if runner
19+
when 'start', 'stop', 'toggle' then return runner[method]() if runner
1920
when 'version' then return meta.version
2021
else $.error '[' + meta.name + '] Method ' + method + ' does not exist'
2122
return @

lib/runner.coffee

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
class Runner
22
constructor: (items, options, start) ->
3-
if !(@ instanceof Runner)
4-
return new Runner(items, options, start)
3+
return new Runner(items, options, start) if !(@ instanceof Runner)
54

65
@items = items
76
id = @id = uid()
@@ -14,8 +13,7 @@ class Runner
1413

1514
@value @settings.startAt
1615

17-
if start or @settings.autostart
18-
@start()
16+
@start() if start or @settings.autostart
1917

2018
running: false
2119
updating: false
@@ -50,7 +48,7 @@ class Runner
5048
format(value, @settings)
5149

5250
update: ->
53-
if not @updating
51+
unless @updating
5452
@updating = true
5553
settings = @settings
5654
time = $.now()
@@ -74,10 +72,9 @@ class Runner
7472
return
7573

7674
start: ->
77-
if not @running
75+
unless @running
7876
@running = true
79-
if not @startTime or @finished
80-
@reset()
77+
@reset() unless @startTime or @finished
8178
@lastTime = $.now()
8279
@interval = setInterval(=>
8380
@update()
@@ -110,7 +107,7 @@ class Runner
110107
return last
111108

112109
reset: (stop) ->
113-
if stop then @stop()
110+
@stop() if stop
114111
@startTime = @lapTime = @lastTime = $.now()
115112
@total = @settings.startAt
116113
@value @total

lib/utils.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runners = {}
66
_uid = 1
77

88
pad = (num) -> (if num < 10 then '0' else '') + num
9-
uid = () -> 'runner' + _uid++
9+
uid = -> 'runner' + _uid++
1010

1111
formatTime = (time, settings) ->
1212
settings = settings or {}

0 commit comments

Comments
 (0)