I don't see a reason why handler should be optional
This commit is contained in:
parent
bb0984835e
commit
2298cb2a1a
@ -22,7 +22,6 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
|
||||
|
||||
import Foundation
|
||||
|
||||
class Event {
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
|
||||
class EventHandler: NSObject {
|
||||
let event:String!
|
||||
let callback:((data:AnyObject?) -> Void)!
|
||||
|
||||
@ -102,6 +102,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
|
||||
}
|
||||
|
||||
// Sends a message
|
||||
// If a message contains binary we have to send those
|
||||
// seperately.
|
||||
func emit(event:String, args:AnyObject? = nil) {
|
||||
if !self.connected {
|
||||
return
|
||||
@ -144,9 +146,9 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
|
||||
}
|
||||
|
||||
// Handles events
|
||||
func handleEvent(#event:String, var data:AnyObject?) {
|
||||
func handleEvent(#event:String, data:AnyObject?) {
|
||||
// println("Should do event: \(event) with data: \(data)")
|
||||
// data = parseData(data as? String)
|
||||
|
||||
for handler in self.handlers {
|
||||
if handler.event == event {
|
||||
if data == nil {
|
||||
@ -160,7 +162,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
|
||||
}
|
||||
|
||||
// Adds handlers to the socket
|
||||
func on(name:String, callback:((data:AnyObject?) -> Void)?) {
|
||||
func on(name:String, callback:((data:AnyObject?) -> Void)) {
|
||||
let handler = EventHandler(event: name, callback: callback)
|
||||
self.handlers.append(handler)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user