Browse Source

Fix typedef callback definitions

master
Brett Langdon 7 years ago
parent
commit
616118f0df
No known key found for this signature in database GPG Key ID: B664881177781B04
8 changed files with 21 additions and 5 deletions
  1. +1
    -1
      customelementconstructor.go
  2. +3
    -0
      eventhandler.go
  3. +1
    -1
      eventhandlernonnull.go
  4. +8
    -1
      generate/generator.go
  5. +3
    -0
      onbeforeunloadeventhandler.go
  6. +1
    -1
      onbeforeunloadeventhandlernonnull.go
  7. +3
    -0
      onerroreventhandler.go
  8. +1
    -1
      onerroreventhandlernonnull.go

+ 1
- 1
customelementconstructor.go View File

@ -4,7 +4,7 @@ package dom
import "syscall/js"
type CustomElementConstructorCallback func() Value
type CustomElementConstructorCallback func()
type CustomElementConstructor struct {
Callback
}


+ 3
- 0
eventhandler.go View File

@ -9,3 +9,6 @@ type EventHandler EventHandlerNonNull
func JSValueToEventHandler(val js.Value) EventHandler {
return EventHandler(JSValueToEventHandlerNonNull(val))
}
func NewEventHandler(c EventHandlerNonNullCallback) EventHandler {
return EventHandler(NewEventHandlerNonNull(c))
}

+ 1
- 1
eventhandlernonnull.go View File

@ -4,7 +4,7 @@ package dom
import "syscall/js"
type EventHandlerNonNullCallback func(event Event) Value
type EventHandlerNonNullCallback func(event Event)
type EventHandlerNonNull struct {
Callback
}


+ 8
- 1
generate/generator.go View File

@ -307,7 +307,7 @@ func (g *Generator) generateCallback(spec Spec) (err error) {
args += fmt.Sprintf("%s %s", a.Name, t)
params += a.Name
}
b.WriteF("type %sCallback func(%s) %s", spec.Name, args, convertIDLType(spec.IDLType))
b.WriteF("type %sCallback func(%s)", spec.Name, args)
b.WriteF("type %s struct {", spec.Name)
b.WriteString("Callback")
@ -378,6 +378,13 @@ func (g *Generator) generateTypedef(spec Spec) (err error) {
}
b.WriteString("}")
p, ok := g.specs[t]
if ok && p.Type == "callback" {
b.WriteF("func New%s(c %sCallback) %s {", spec.Name, p.Name, spec.Name)
b.WriteF("return %s(New%s(c))", spec.Name, p.Name)
b.WriteString("}")
}
return g.writeFile(spec, b)
}


+ 3
- 0
onbeforeunloadeventhandler.go View File

@ -9,3 +9,6 @@ type OnBeforeUnloadEventHandler OnBeforeUnloadEventHandlerNonNull
func JSValueToOnBeforeUnloadEventHandler(val js.Value) OnBeforeUnloadEventHandler {
return OnBeforeUnloadEventHandler(JSValueToOnBeforeUnloadEventHandlerNonNull(val))
}
func NewOnBeforeUnloadEventHandler(c OnBeforeUnloadEventHandlerNonNullCallback) OnBeforeUnloadEventHandler {
return OnBeforeUnloadEventHandler(NewOnBeforeUnloadEventHandlerNonNull(c))
}

+ 1
- 1
onbeforeunloadeventhandlernonnull.go View File

@ -4,7 +4,7 @@ package dom
import "syscall/js"
type OnBeforeUnloadEventHandlerNonNullCallback func(event Event) string
type OnBeforeUnloadEventHandlerNonNullCallback func(event Event)
type OnBeforeUnloadEventHandlerNonNull struct {
Callback
}


+ 3
- 0
onerroreventhandler.go View File

@ -9,3 +9,6 @@ type OnErrorEventHandler OnErrorEventHandlerNonNull
func JSValueToOnErrorEventHandler(val js.Value) OnErrorEventHandler {
return OnErrorEventHandler(JSValueToOnErrorEventHandlerNonNull(val))
}
func NewOnErrorEventHandler(c OnErrorEventHandlerNonNullCallback) OnErrorEventHandler {
return OnErrorEventHandler(NewOnErrorEventHandlerNonNull(c))
}

+ 1
- 1
onerroreventhandlernonnull.go View File

@ -4,7 +4,7 @@ package dom
import "syscall/js"
type OnErrorEventHandlerNonNullCallback func(event Value, source string, lineno int, colno int, error Value) Value
type OnErrorEventHandlerNonNullCallback func(event Value, source string, lineno int, colno int, error Value)
type OnErrorEventHandlerNonNull struct {
Callback
}


Loading…
Cancel
Save