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

clean up

Browse Source
This commit is contained in:
Erik 2015-04-09 09:05:23 -04:00
parent 7845251fc6
commit 31e2f0ea4b
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SwiftIO/SocketIOClient.swift
View File

@ -343,15 +343,8 @@ public class SocketIOClient: NSObject, SocketEngineClient {
// Called when the socket gets an ack for something it sent // Called when the socket gets an ack for something it sent
func handleAck(ack:Int, data:AnyObject?) { func handleAck(ack:Int, data:AnyObject?) {
var ackData:[AnyObject]? self.ackHandlers.executeAck(ack,
items: data as? [AnyObject]? ?? data != nil ? [data!] : nil)
if data is NSArray {
ackData = (data as? [AnyObject]?)!
} else if data != nil {
ackData = [data!]
}
self.ackHandlers.executeAck(ack, items: ackData)
} }
/** /**

8
SwiftIO/SocketParser.swift
View File

@ -147,13 +147,7 @@ class SocketParser {
if ++i < arr.count { if ++i < arr.count {
let d = String(arr[i...arr.count-1]) let d = String(arr[i...arr.count-1])
let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
let data:[AnyObject] let data = SocketParser.parseData(noPlaceholders) as? [AnyObject] ?? [noPlaceholders]
if let isArr = SocketParser.parseData(noPlaceholders) as? [AnyObject] {
data = isArr
} else {
data = [noPlaceholders]
}
return SocketPacket(type: SocketPacketType(str: type), data: data, return SocketPacket(type: SocketPacketType(str: type), data: data,
nsp: nsp, placeholders: placeholders, id: id) nsp: nsp, placeholders: placeholders, id: id)