Merge branch 'jayrhynas-master'

Author: radex

Src/SwiftyTimer.swift

@@ -63,17 +63,30 @@ extension NSTimer {
 
     public class func after(interval: NSTimeInterval, _ block: () -> ()) -> NSTimer {
         let timer = NSTimer.new(after: interval, block)
-        NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
+        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: () -> ()) -> NSTimer {
         let timer = NSTimer.new(every: interval, block)
-        NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
+        timer.start()
         return timer
     }
+    
+    /// Schedule this timer on the run loop
+    ///
+    /// By default, the timer is scheduled on the current run loop for the default mode.
+    /// Specify `runLoop` or `modes` to override these defaults.
+    
+    public func start(runLoop: NSRunLoop = NSRunLoop.currentRunLoop(), modes: String...) {
+        let modes = modes.count != 0 ? modes : [NSDefaultRunLoopMode]
+        
+        for mode in modes {
+            runLoop.addTimer(self, forMode: mode)
+        }
+    }
 }
 
 extension Double {

Tests/SwiftyTimerTests/main.swift

@@ -50,7 +50,30 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
     }
 
+    var timer4: NSTimer!
+    
     func test5() {
+        var fired = false
+        timer4 = NSTimer.new(every: 0.1.seconds) {
+            if fired {
+                self.timer4.invalidate()
+                self.test6()
+            } else {
+                fired = true
+            }
+        }
+        timer4.start()
+    }
+    
+    func test6() {
+        let timer = NSTimer.new(after: 0.1.seconds) {
+            self.test7()
+        }
+        
+        timer.start(modes: NSDefaultRunLoopMode, NSEventTrackingRunLoopMode, runLoop: NSRunLoop.currentRunLoop())
+    }
+
+    func test7() {
         NSTimer.after(0.1.seconds, done)
     }