Merge pull request #5 from norunners/master

Updated event listeners to Go-1.12.

Author: bketelsen

dom.go

@@ -1076,13 +1076,13 @@ func (w *window) Stop() {
 
 // TODO reuse util.EventTarget
 
-func (w *window) AddEventListener(typ string, useCapture bool, listener func(Event)) func(o *js.Object) {
-	wrapper := func(o *js.Object) { listener(wrapEvent(o)) }
-	w.Call("addEventListener", typ, wrapper, useCapture)
-	return wrapper
+func (w *window) AddEventListener(typ string, listener func(Event), useCapture bool) func(o *js.Object) {
+	fn := func(o *js.Object) { listener(wrapEvent(o)) }
+	w.Call("addEventListener", typ, fn, useCapture)
+	return fn
 }
 
-func (w *window) RemoveEventListener(typ string, useCapture bool, listener func(*js.Object)) {
+func (w *window) RemoveEventListener(typ string, listener func(*js.Object), useCapture bool) {
 	w.Call("removeEventListener", typ, listener, useCapture)
 }
 
@@ -1259,13 +1259,13 @@ func (n *BasicNode) Underlying() *js.Object {
 	return n.Object
 }
 
-func (n *BasicNode) AddEventListener(typ string, useCapture bool, listener func(Event)) func(*js.Object) {
-	wrapper := func(o *js.Object) { listener(wrapEvent(o)) }
-	n.Call("addEventListener", typ, wrapper, useCapture)
-	return wrapper
+func (n *BasicNode) AddEventListener(typ string, listener func(Event), useCapture bool) func(*js.Object) {
+	fn := func(o *js.Object) { listener(wrapEvent(o)) }
+	n.Call("addEventListener", typ, fn, useCapture)
+	return fn
 }
 
-func (n *BasicNode) RemoveEventListener(typ string, useCapture bool, listener func(*js.Object)) {
+func (n *BasicNode) RemoveEventListener(typ string, listener func(*js.Object), useCapture bool) {
 	n.Call("removeEventListener", typ, listener, useCapture)
 }
 

dom_wasm.go

@@ -1088,14 +1088,16 @@ func (w *window) Stop() {
 
 // TODO reuse util.EventTarget
 
-func (w *window) AddEventListener(typ string, useCapture bool, listener func(Event)) js.Callback {
-	wrapper := func(o js.Value) { listener(wrapEvent(o)) }
-	cb := js.NewEventCallback(0, wrapper)
-	w.Call("addEventListener", typ, cb, useCapture)
-	return cb
+func (w *window) AddEventListener(typ string, listener func(Event), useCapture bool) js.Func {
+	fn := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
+		listener(wrapEvent(args[0]))
+		return nil
+	})
+	w.Call("addEventListener", typ, fn, useCapture)
+	return fn
 }
 
-func (w *window) RemoveEventListener(typ string, useCapture bool, listener js.Callback) {
+func (w *window) RemoveEventListener(typ string, listener js.Func, useCapture bool) {
 	w.Call("removeEventListener", typ, listener, useCapture)
 	listener.Release()
 }
@@ -1274,14 +1276,16 @@ func (n *BasicNode) Underlying() js.Value {
 	return n.Object
 }
 
-func (n *BasicNode) AddEventListener(typ string, useCapture bool, listener func(Event)) js.Callback {
-	wrapper := func(o js.Value) { listener(wrapEvent(o)) }
-	cb := js.NewEventCallback(0, wrapper)
-	n.Object.Call("addEventListener", typ, cb, useCapture)
-	return cb
+func (n *BasicNode) AddEventListener(typ string, listener func(Event), useCapture bool) js.Func {
+	fn := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
+		listener(wrapEvent(args[0]))
+		return nil
+	})
+	n.Object.Call("addEventListener", typ, fn, useCapture)
+	return fn
 }
 
-func (n *BasicNode) RemoveEventListener(typ string, useCapture bool, listener js.Callback) {
+func (n *BasicNode) RemoveEventListener(typ string, listener js.Func, useCapture bool) {
 	n.Object.Call("removeEventListener", typ, listener, useCapture)
 	listener.Release()
 }

events.go

@@ -406,9 +406,9 @@ type WheelEvent struct {
 
 type EventTarget interface {
 	// AddEventListener adds a new event listener and returns the
-	// wrapper function it generated. If using RemoveEventListener,
-	// that wrapper has to be used.
-	AddEventListener(typ string, useCapture bool, listener func(Event)) func(*js.Object)
-	RemoveEventListener(typ string, useCapture bool, listener func(*js.Object))
+	// function it created. If using RemoveEventListener,
+	// that function has to be used.
+	AddEventListener(typ string, listener func(Event), useCapture bool) func(*js.Object)
+	RemoveEventListener(typ string, listener func(*js.Object), useCapture bool)
 	DispatchEvent(event Event) bool
 }

events_wasm.go

@@ -407,9 +407,9 @@ type WheelEvent struct {
 
 type EventTarget interface {
 	// AddEventListener adds a new event listener and returns the
-	// wrapper function it generated. If using RemoveEventListener,
-	// that wrapper has to be used.
-	AddEventListener(typ string, useCapture bool, listener func(Event)) js.Callback
-	RemoveEventListener(typ string, useCapture bool, listener js.Callback)
+	// function it created. If using RemoveEventListener,
+	// that function has to be used.
+	AddEventListener(typ string, listener func(Event), useCapture bool) js.Func
+	RemoveEventListener(typ string, listener js.Func, useCapture bool)
 	DispatchEvent(event Event) bool
 }