cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't async handlers, change ioURL

Browse Source
This commit is contained in:
Erik 2015-02-13 23:37:06 -05:00
parent f826ca4b8e
commit 5f179ac278
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SwiftIO/SocketIOClient.swift
View File

@ -58,7 +58,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
} }
mutURL = mutURL["http://"] ~= "" mutURL = mutURL["http://"] ~= ""
mutURL = mutURL["https://"] ~= "" mutURL = mutURL["https://"] ~= ""
self.socketURL = mutURL self.socketURL = mutURL
// Set options // Set options
@ -101,9 +101,9 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
var endpoint:String var endpoint:String
if self.secure { if self.secure {
endpoint = "wss://\(self.socketURL)/socket.io/?EIO=2&transport=websocket" endpoint = "wss://\(self.socketURL)/socket.io/?transport=websocket"
} else { } else {
endpoint = "ws://\(self.socketURL)/socket.io/?EIO=2&transport=websocket" endpoint = "ws://\(self.socketURL)/socket.io/?transport=websocket"
} }
self.io = SRWebSocket(URL: NSURL(string: endpoint)) self.io = SRWebSocket(URL: NSURL(string: endpoint))
@ -212,14 +212,10 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
for handler in self.handlers { for handler in self.handlers {
if handler.event == event { if handler.event == event {
if data is NSArray { if data is NSArray {
dispatch_async(dispatch_get_main_queue()) { handler.executeCallback(nil, items: (data as! NSArray))
handler.executeCallback(nil, items: (data as! NSArray))
}
} else { } else {
dispatch_async(dispatch_get_main_queue()) { handler.executeCallback(data)
handler.executeCallback(data)
}
} }
} }
} }