From fa59915b058c39bbb9cd722e6e9604e11d059b40 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 27 Jan 2015 10:10:50 -0500 Subject: [PATCH] tweaks --- SwiftIO/SocketEventHandler.swift | 8 ++------ SwiftIO/SocketIOClient.swift | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SwiftIO/SocketEventHandler.swift b/SwiftIO/SocketEventHandler.swift index 8baf729..3ad2c3f 100644 --- a/SwiftIO/SocketEventHandler.swift +++ b/SwiftIO/SocketEventHandler.swift @@ -25,7 +25,7 @@ class SocketEventHandler { let event:String! let callback:((data:AnyObject?) -> Void)! - var callbackMult:((data:[AnyObject]) -> Void)! + let callbackMult:((data:[AnyObject]) -> Void)! init(event:String, callback:((data:AnyObject?) -> Void)) { self.event = event @@ -38,11 +38,7 @@ class SocketEventHandler { } func executeCallback(args:AnyObject?) { - if args != nil { - callback(data: args!) - } else { - callback(data: nil) - } + callback(data: args) } func executeCallback(args:[AnyObject]) { diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index 9e40d89..a617beb 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -128,6 +128,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { let sendData = self.createBinaryDataForSend(data) datas.append(sendData) } + hasBinary = true items[i] = newDict continue