From 761623a0f89ff24a141533577019b36dfa07dd1a Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 2 Mar 2015 13:59:22 -0500 Subject: [PATCH] fix emit with no args --- SwiftIO/SocketEvent.swift | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift index 22465e6..26d8499 100644 --- a/SwiftIO/SocketEvent.swift +++ b/SwiftIO/SocketEvent.swift @@ -74,29 +74,29 @@ class SocketEvent { if !hasBinary { if nsp == nil { if ack == nil { - message = "42[\"\(event)\"," + message = "42[\"\(event)\"" } else { - message = "42\(ack!)[\"\(event)\"," + message = "42\(ack!)[\"\(event)\"" } } else { if ack == nil { - message = "42/\(nsp!),[\"\(event)\"," + message = "42/\(nsp!),[\"\(event)\"" } else { - message = "42/\(nsp!),\(ack!)[\"\(event)\"," + message = "42/\(nsp!),\(ack!)[\"\(event)\"" } } } else { if nsp == nil { if ack == nil { - message = "45\(datas)-[\"\(event)\"," + message = "45\(datas)-[\"\(event)\"" } else { - message = "45\(datas)-\(ack!)[\"\(event)\"," + message = "45\(datas)-\(ack!)[\"\(event)\"" } } else { if ack == nil { - message = "45\(datas)-/\(nsp!),[\"\(event)\"," + message = "45\(datas)-/\(nsp!),[\"\(event)\"" } 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? if args.count == 0 { return message + "]" + } else if !ack { + message += "," } for arg in args {