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

hopefully fix nuclearace/Socket.IO-Client-Swift#27

Browse Source
This commit is contained in:
Erik 2015-03-17 12:12:30 -04:00
parent 7d08f962d5
commit ac31b4a788
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SwiftIO/SocketIOClient.swift
View File

@ -206,8 +206,8 @@ public class SocketIOClient: NSObject {
ackNum: self.currentAck, socket: self) ackNum: self.currentAck, socket: self)
self.ackHandlers.append(ackHandler) self.ackHandlers.append(ackHandler)
dispatch_async(self.emitQueue) {[weak self] in dispatch_async(self.emitQueue) {[weak self, ack = self.currentAck] in
self?._emit(event, args, ack: true) self?._emit(event, args, ack: ack)
return return
} }
@ -218,7 +218,7 @@ public class SocketIOClient: NSObject {
return self.emitWithAck(event, args) return self.emitWithAck(event, args)
} }
private func _emit(event:String, _ args:[AnyObject], ack:Bool = false) { private func _emit(event:String, _ args:[AnyObject], ack:Int? = nil) {
var frame:SocketEvent var frame:SocketEvent
var str:String var str:String
@ -229,22 +229,22 @@ public class SocketIOClient: NSObject {
} }
if hasBinary { if hasBinary {
if !ack { if ack == nil {
str = SocketEvent.createMessageForEvent(event, withArgs: items, str = SocketEvent.createMessageForEvent(event, withArgs: items,
hasBinary: true, withDatas: emitDatas.count, toNamespace: self.nsp) hasBinary: true, withDatas: emitDatas.count, toNamespace: self.nsp)
} else { } else {
str = SocketEvent.createMessageForEvent(event, withArgs: items, str = SocketEvent.createMessageForEvent(event, withArgs: items,
hasBinary: true, withDatas: emitDatas.count, toNamespace: self.nsp, wantsAck: self.currentAck) hasBinary: true, withDatas: emitDatas.count, toNamespace: self.nsp, wantsAck: ack)
} }
self.engine?.send(str, datas: emitDatas) self.engine?.send(str, datas: emitDatas)
} else { } else {
if !ack { if ack == nil {
str = SocketEvent.createMessageForEvent(event, withArgs: items, hasBinary: false, str = SocketEvent.createMessageForEvent(event, withArgs: items, hasBinary: false,
withDatas: 0, toNamespace: self.nsp) withDatas: 0, toNamespace: self.nsp)
} else { } else {
str = SocketEvent.createMessageForEvent(event, withArgs: items, hasBinary: false, str = SocketEvent.createMessageForEvent(event, withArgs: items, hasBinary: false,
withDatas: 0, toNamespace: self.nsp, wantsAck: self.currentAck) withDatas: 0, toNamespace: self.nsp, wantsAck: ack)
} }
self.engine?.send(str) self.engine?.send(str)