add timer into closure

phamquochoan · phamquochoan · commit ad051f54c575 · 2015-06-24T10:13:23.000+07:00
diff --git a/Src/SwiftyTimer.swift b/Src/SwiftyTimer.swift
@@ -24,15 +24,18 @@
 
 import Foundation
 
+import Foundation
+
 private class NSTimerActor {
-    var block: () -> Void
+    var block: (NSTimer!) -> Void
+    var timer: NSTimer!
     
-    init(_ block: () -> Void) {
+    init(_ block: (NSTimer!) -> Void) {
         self.block = block
     }
     
     @objc func fire() {
-        block()
+        block(timer)
     }
 }
 
@@ -44,32 +47,38 @@ extension NSTimer {
     /// **Note:** the timer won't fire until it's scheduled on the run loop.
     /// Use `NSTimer.after` to create and schedule a timer in one step.
     
-    public class func new(after interval: NSTimeInterval, _ block: () -> Void) -> NSTimer {
+    public class func new(after interval: NSTimeInterval, _ block: (NSTimer!) -> Void) -> NSTimer {
+        let timer: NSTimer!
         let actor = NSTimerActor(block)
-        return self.init(timeInterval: interval, target: actor, selector: "fire", userInfo: nil, repeats: false)
+        timer = self.init(timeInterval: interval, target: actor, selector: "fire", userInfo: nil, repeats: false)
+        actor.timer = timer
+        return timer
     }
     
     /// Create a timer that will call `block` repeatedly in specified time intervals.
     ///
     /// **Note:** the timer won't fire until it's scheduled on the run loop.
     /// Use `NSTimer.every` to create and schedule a timer in one step.
     
-    public class func new(every interval: NSTimeInterval, _ block: () -> Void) -> NSTimer {
+    public class func new(every interval: NSTimeInterval, _ block: (NSTimer!) -> Void) -> NSTimer {
+        let timer: NSTimer!
         let actor = NSTimerActor(block)
-        return self.init(timeInterval: interval, target: actor, selector: "fire", userInfo: nil, repeats: true)
+        timer = self.init(timeInterval: interval, target: actor, selector: "fire", userInfo: nil, repeats: true)
+        actor.timer = timer
+        return timer
     }
     
     /// Create and schedule a timer that will call `block` once after the specified time.
     
-    public class func after(interval: NSTimeInterval, _ block: () -> Void) -> NSTimer {
+    public class func after(interval: NSTimeInterval, _ block: (NSTimer!) -> Void) -> NSTimer {
         let timer = NSTimer.new(after: interval, block)
         timer.start()
         return timer
     }
     
     /// Create and schedule a timer that will call `block` repeatedly in specified time intervals.
     
-    public class func every(interval: NSTimeInterval, _ block: () -> Void) -> NSTimer {
+    public class func every(interval: NSTimeInterval, _ block: (NSTimer!) -> Void) -> NSTimer {
         let timer = NSTimer.new(every: interval, block)
         timer.start()
         return timer
