From 2298cb2a1a7257fad4c22260fe1df2d08db285c3 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 19 Jan 2015 10:24:49 -0500 Subject: [PATCH] I don't see a reason why handler should be optional --- SwiftIO/Event.swift | 1 - SwiftIO/EventHandler.swift | 1 - SwiftIO/SocketIOClient.swift | 8 +++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SwiftIO/Event.swift b/SwiftIO/Event.swift index db538ee..bc9edd0 100644 --- a/SwiftIO/Event.swift +++ b/SwiftIO/Event.swift @@ -22,7 +22,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. - import Foundation class Event { diff --git a/SwiftIO/EventHandler.swift b/SwiftIO/EventHandler.swift index 001f13b..34e49c4 100644 --- a/SwiftIO/EventHandler.swift +++ b/SwiftIO/EventHandler.swift @@ -24,7 +24,6 @@ import Foundation - class EventHandler: NSObject { let event:String! let callback:((data:AnyObject?) -> Void)! diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index 273f9a9..8c09988 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -102,6 +102,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { } // Sends a message + // If a message contains binary we have to send those + // seperately. func emit(event:String, args:AnyObject? = nil) { if !self.connected { return @@ -144,9 +146,9 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { } // Handles events - func handleEvent(#event:String, var data:AnyObject?) { + func handleEvent(#event:String, data:AnyObject?) { // println("Should do event: \(event) with data: \(data)") - // data = parseData(data as? String) + for handler in self.handlers { if handler.event == event { if data == nil { @@ -160,7 +162,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { } // Adds handlers to the socket - func on(name:String, callback:((data:AnyObject?) -> Void)?) { + func on(name:String, callback:((data:AnyObject?) -> Void)) { let handler = EventHandler(event: name, callback: callback) self.handlers.append(handler) }