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