Skip to content

Commit 761623a

Browse files
committed
fix emit with no args
1 parent 3d7540d commit 761623a

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

SwiftIO/SocketEvent.swift

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,29 +74,29 @@ class SocketEvent {
7474
if !hasBinary {
7575
if nsp == nil {
7676
if ack == nil {
77-
message = "42[\"\(event)\","
77+
message = "42[\"\(event)\""
7878
} else {
79-
message = "42\(ack!)[\"\(event)\","
79+
message = "42\(ack!)[\"\(event)\""
8080
}
8181
} else {
8282
if ack == nil {
83-
message = "42/\(nsp!),[\"\(event)\","
83+
message = "42/\(nsp!),[\"\(event)\""
8484
} else {
85-
message = "42/\(nsp!),\(ack!)[\"\(event)\","
85+
message = "42/\(nsp!),\(ack!)[\"\(event)\""
8686
}
8787
}
8888
} else {
8989
if nsp == nil {
9090
if ack == nil {
91-
message = "45\(datas)-[\"\(event)\","
91+
message = "45\(datas)-[\"\(event)\""
9292
} else {
93-
message = "45\(datas)-\(ack!)[\"\(event)\","
93+
message = "45\(datas)-\(ack!)[\"\(event)\""
9494
}
9595
} else {
9696
if ack == nil {
97-
message = "45\(datas)-/\(nsp!),[\"\(event)\","
97+
message = "45\(datas)-/\(nsp!),[\"\(event)\""
9898
} else {
99-
message = "45\(datas)-/\(nsp!),\(ack!)[\"\(event)\","
99+
message = "45\(datas)-/\(nsp!),\(ack!)[\"\(event)\""
100100
}
101101
}
102102
}
@@ -122,14 +122,16 @@ class SocketEvent {
122122
}
123123
}
124124

125-
return self.completeMessage(msg, args: args)
125+
return self.completeMessage(msg, args: args, ack: true)
126126
}
127127

128-
private class func completeMessage(var message:String, args:[AnyObject]) -> String {
128+
private class func completeMessage(var message:String, args:[AnyObject], ack:Bool = false) -> String {
129129
var err:NSError?
130130

131131
if args.count == 0 {
132132
return message + "]"
133+
} else if !ack {
134+
message += ","
133135
}
134136

135137
for arg in args {

0 commit comments

Comments
 (0)