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

some swift3 changes

Browse Source
This commit is contained in:
Erik 2016-07-14 19:54:09 -04:00
parent f6dc11650d
commit f3d771641d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/SocketIOClient.swift
View File

@ -124,11 +124,12 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
/// Connect to the server. /// Connect to the server.
public func connect() { public func connect() {
connect(0, handleWith: nil) connect(timeoutAfter: 0, withHandler: nil)
} }
/// Connect to the server. If we aren't connected after timeoutAfter, call handler /// Connect to the server. If we aren't connected after timeoutAfter, call withHandler
public func connect(_ timeoutAfter: Int, handleWith handler: (() -> Void)?) { /// 0 Never times out
public func connect(timeoutAfter: Int, withHandler handler: (() -> Void)?) {
assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)") assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)")
guard status != .connected else { guard status != .connected else {
@ -410,6 +411,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
handlers.removeAll(keepingCapacity: false) handlers.removeAll(keepingCapacity: false)
} }
/// Because Swift 3 removes a lot of implicit briding so we have to perform more casts
func socketDataToAnyObject(_ data: [SocketData]) -> [AnyObject] { func socketDataToAnyObject(_ data: [SocketData]) -> [AnyObject] {
return data.flatMap({$0 as? AnyObject}) return data.flatMap({$0 as? AnyObject})
} }