change EventName and remove events in vue.Option

oskca · oskca · commit 9bf3f6e9898d · 2017-01-21T19:26:29.000+08:00
diff --git a/component.go b/component.go
@@ -72,7 +72,7 @@ func NewComponent(
 	opt.Data = vmfn
 	opt.Template = templateStr
 	opt.Replace = replace
-	opt.OnLifeCycleEvent(VmInit, func(vm *ViewModel) {
+	opt.OnLifeCycleEvent(EvtBeforeCreate, func(vm *ViewModel) {
 		vm.Options.Set("methods", js.MakeWrapper(vmfn()))
 		vMap[vmfn()] = vm
 	})
diff --git a/option.go b/option.go
@@ -10,19 +10,19 @@ import (
 type LifeCycleEvent string
 
 const (
-	VmInit          LifeCycleEvent = "init"
-	VmCreated       LifeCycleEvent = "created"
-	VmBeforeCompile LifeCycleEvent = "beforeCompile"
-	VmCompiled      LifeCycleEvent = "compiled"
-	VmReady         LifeCycleEvent = "ready"
-	VmAttached      LifeCycleEvent = "attached"
-	VmDetached      LifeCycleEvent = "detached"
-	VmBeforeDestroy LifeCycleEvent = "beforeDestroy"
-	VmDestroyed     LifeCycleEvent = "destroyed"
+	EvtBeforeCreate  LifeCycleEvent = "beforeCreate"
+	EvtCreated       LifeCycleEvent = "created"
+	EvtBeforeMount   LifeCycleEvent = "beforeMount"
+	EvtMounted       LifeCycleEvent = "mounted"
+	EvtBeforeUpdate  LifeCycleEvent = "beforeUpdate"
+	EvtUpdated       LifeCycleEvent = "updated"
+	EvtActivated     LifeCycleEvent = "activated"
+	EvtDeactivated   LifeCycleEvent = "deactivated"
+	EvtBeforeDestroy LifeCycleEvent = "beforeDestroy"
+	EvtDestroyed     LifeCycleEvent = "destroyed"
 )
 
-// Option are used to organize mutiple sub component together to
-// construct VueJS apps or (higher level) components.
+// Option is used to config VueJS instance or to create VueJS components.
 type Option struct {
 	*js.Object
 
@@ -139,9 +139,7 @@ type Option struct {
 	Parent *js.Object `js:"parent"`
 
 	// map to sub component
-	mcom map[string]*Component
-	// map to event handler
-	mevt map[string]interface{}
+	coms map[string]*Component
 	// properties
 	props []string
 	// mixins
@@ -152,8 +150,7 @@ func NewOption() *Option {
 	c := &Option{
 		Object: js.Global.Get("Object").New(),
 	}
-	c.mcom = make(map[string]*Component, 0)
-	c.mevt = make(map[string]interface{}, 0)
+	c.coms = make(map[string]*Component, 0)
 	c.props = []string{}
 	c.mixins = []js.M{}
 	return c
@@ -174,11 +171,8 @@ func (o *Option) NewComponent() *Component {
 
 // prepare set the proper options into js.Object
 func (c *Option) prepare() (opts *js.Object) {
-	if len(c.mcom) > 0 {
-		c.Set("components", c.mcom)
-	}
-	if len(c.mevt) > 0 {
-		c.Set("events", c.mevt)
+	if len(c.coms) > 0 {
+		c.Set("components", c.coms)
 	}
 	if len(c.props) > 0 {
 		c.Set("props", c.props)
@@ -243,17 +237,7 @@ func (c *Option) addMixin(name string, val interface{}) *Option {
 
 // AddComponent add sub component to the genereated VueJS instance (optional)
 func (c *Option) AddSubComponent(name string, sub *Component) *Option {
-	c.mcom[name] = sub
-	return c
-}
-
-// On add EventHandler to VueJS-generated component-oriented event
-// for cross component message passing
-func (c *Option) On(event string, fn func(vm *ViewModel, args []*js.Object)) *Option {
-	c.mevt[event] = js.MakeFunc(func(this *js.Object, args []*js.Object) interface{} {
-		fn(newViewModel(this), args)
-		return nil
-	})
+	c.coms[name] = sub
 	return c
 }
 
