use semantic delay

Author: zbryikt

README.md

@@ -34,8 +34,8 @@ config includes following options:
  * atomic: default true. when atomic is false, you will need N ldLoader.off() call to dismiss ldLoader if there was already N ldLoader.on() call.
 
 Methods:
- * on(delay): toggle loader on. return promise. (if delay is provided, on then resolve after delay(ms). )
- * off(delay): toggle loader off. (if delay is provided, resolve after delay(ms), then off. )
+ * on(delay): toggle loader on. return promise. (if delay is provided, wait delay(ms) before on )
+ * off(delay): toggle loader off. (if delay is provided, wait delay(ms) before off )
  * is-on: return true if loader is running, else false.
  * toggle(state,delay): toggle loader based on state(true/false). toggle according to current state if state is omitted. return promise ( delay behavior according to whether it's on or off )
  * on(event, cb): listen to events, including: ( TBD? conflict with on(delay) )

dist/ldld.js

@@ -22,6 +22,8 @@
     is-on: -> return @running
     on: (delay=0) -> @toggle true, delay
     off: (delay=0, force = false) -> @toggle false, delay, force
+    # if v defined, force state to v.
+    cancel: (v) -> clearTimeout @handle; if v? => @toggle v
     flash: (dur=1000, delay=0) -> @toggle(true, delay).then ~> @toggle false, dur + delay
     render: ->
       if !(@running and @opt.ctrl and @opt.ctrl.step) => return @render.runid = -1
@@ -36,9 +38,15 @@
       ret = requestAnimationFrame -> _ it
     toggle: (v, delay=0, force = false) ->
       d = (if !(v?) => (if @root.0.classList.contains @opt.active-class => -1 else 1) else if v => 1 else -1)
+      if @handle => @cancel!
       if delay => return new Promise (res, rej) ~>
-        if d > 0 => @toggle(v)then ~> setTimeout (~> res!), delay # if is on : resolve after on
-        else => setTimeout (~> @toggle(v)then ~> res!), delay # if is off: off after resolve
+        # new approach - treat delay directly as a simple delay before action.
+        @handle = setTimeout (~> @toggle(v)then ~> res!), delay
+        # old approach
+        # if is on: resolve after on
+        #if d > 0 => @toggle(v)then ~> setTimeout (~> res!), delay
+        # if is off: off after resolve
+        #else => setTimeout (~> @toggle(v)then ~> res!), delay
       new Promise (res, rej) ~>
         @count += d
         if !force and !@opt.atomic and ( @count >= 2 or (@count == 1 and d < 0)) => return res!