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

fix emit with no args

Browse Source
This commit is contained in:
Erik 2015-03-02 13:52:01 -05:00
parent 211dc1dd22
commit 02b1314a3d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SwiftIO/SocketEvent.swift
View File

@ -74,29 +74,29 @@ class SocketEvent {
if !hasBinary { if !hasBinary {
if nsp == nil { if nsp == nil {
if ack == nil { if ack == nil {
message = "42[\"\(event)\"," message = "42[\"\(event)\""
} else { } else {
message = "42\(ack!)[\"\(event)\"," message = "42\(ack!)[\"\(event)\""
} }
} else { } else {
if ack == nil { if ack == nil {
message = "42/\(nsp!),[\"\(event)\"," message = "42/\(nsp!),[\"\(event)\""
} else { } else {
message = "42/\(nsp!),\(ack!)[\"\(event)\"," message = "42/\(nsp!),\(ack!)[\"\(event)\""
} }
} }
} else { } else {
if nsp == nil { if nsp == nil {
if ack == nil { if ack == nil {
message = "45\(datas)-[\"\(event)\"," message = "45\(datas)-[\"\(event)\""
} else { } else {
message = "45\(datas)-\(ack!)[\"\(event)\"," message = "45\(datas)-\(ack!)[\"\(event)\""
} }
} else { } else {
if ack == nil { if ack == nil {
message = "45\(datas)-/\(nsp!),[\"\(event)\"," message = "45\(datas)-/\(nsp!),[\"\(event)\""
} else { } else {
message = "45\(datas)-/\(nsp!),\(ack!)[\"\(event)\"," message = "45\(datas)-/\(nsp!),\(ack!)[\"\(event)\""
} }
} }
} }
@ -122,14 +122,16 @@ class SocketEvent {
} }
} }
return self.completeMessage(msg, args: args) return self.completeMessage(msg, args: args, ack: true)
} }
private class func completeMessage(var message:String, args:[AnyObject]) -> String { private class func completeMessage(var message:String, args:[AnyObject], ack:Bool = false) -> String {
var err:NSError? var err:NSError?
if args.count == 0 { if args.count == 0 {
return message + "]" return message + "]"
} else if !ack {
message += ","
} }
for arg in args { for arg in args {
@ -157,6 +159,7 @@ class SocketEvent {
if message != "" { if message != "" {
message.removeAtIndex(message.endIndex.predecessor()) message.removeAtIndex(message.endIndex.predecessor())
} }
return message + "]" return message + "]"
} }