update examples

oskca · oskca · commit 051dce9a895d · 2016-03-27T19:10:15.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,5 @@ examples/basic/basic.js.map
 examples/basic/basic.js
 examples/unwritableTime/unwritableTime.js
 examples/unwritableTime/unwritableTime.js.map
+examples/component/component.js
+examples/component/component.js.map
diff --git a/component.go b/component.go
@@ -69,8 +69,9 @@ func Extend(opt js.M) *Component {
 	}
 }
 
-func RegisterComponent(name string, component *Component) {
+func RegisterComponent(name string, component *Component) *Component {
 	vue.Call("component", name, component.Object)
+	return component
 }
 
 func GetComponent(name string) *Component {
diff --git a/examples/basic/basic.go b/examples/basic/basic.go
@@ -34,43 +34,49 @@ type Model struct {
 	Now          func() string `js:"Now"`
 }
 
-func (m Model) Inc() {
+func (m *Model) Inc() {
 	m.IntValue += 1
+	println("inc called")
 }
 
-func (m Model) Repeat() {
+func (m *Model) Repeat() {
 	m.Str = strings.Repeat(m.Str, 3)
 }
 
-func (m Model) PopulateTodo() {
+func (m *Model) PopulateTodo() {
 	m.Todos = append(m.Todos, NewTodo(m.Str))
-	vm := vue.Get(m)
+	vm := vue.GetVM(m)
 	println("Get(m):", vm)
 	println("integer from vm:", vm.Get("integer").Int())
 }
 
-func (m Model) Then() string {
-	m.IntValue += 1
-	return time.Now().String() + fmt.Sprintf(" ==> i:%d", m.IntValue)
+func (m *Model) WhatTF() string {
+	println("then called", m.IntValue)
+	// m.List = append(m.List, m.IntValue)
+	return time.Now().String()
+}
+
+func (m *Model) DoubleInt() int {
+	return 2 * m.IntValue
 }
 
 func main() {
 	m := &Model{
-		Object:   js.Global.Get("Object").New(),
-		IntValue: 100,
-		List:     []int{1, 2, 3, 4},
+		Object: js.Global.Get("Object").New(),
 	}
 	// this is the correct way to initialize the gopherjs struct
 	// which would be used in the JavaScript side.
-	// m.IntValue = 100
+	m.IntValue = 100
 	m.Str = "a string"
 	m.List = []int{1, 2, 3, 4}
 	m.Todos = []*Todo{}
 	m.AllItems = []string{"A", "B", "C", "D", "John", "Bill"}
 	m.CheckedItems = []string{}
-	m.Now = func() string { return time.Now().String() + fmt.Sprintf(" ==> i:%d", m.IntValue) }
+	m.Now = func() string {
+		println("now:", m.IntValue)
+		return time.Now().String() + fmt.Sprintf(" ==> i:%d", m.IntValue)
+	}
 	v := vue.New("#app", m)
-	println("vm:", v)
 	v.WatchEx("integer", func(val *js.Object) {
 		println("IntValue changed to:", val, "m.IntValue:", m.IntValue)
 		m.Str = fmt.Sprintf("after watch:%d", m.IntValue)
diff --git a/examples/basic/index.html b/examples/basic/index.html
@@ -14,25 +14,26 @@
     <div id="app" v-cloak>
         integer: <span> {{ integer }} </span>
         <br>
-        <div>Field Func: {{Now()}}</div>
-        <div>Method Func: {{Then()}}</div>
+        <div>Field Func: {{ Now() }}</div>
+        <div>Methond Func: {{ WhatTF() }}</div>
+        <div>DoubleInt: {{ DoubleInt() }}</div>
         <template v-for="item in AllItems">
             <label style="display: inline;">
                 {{item}}
-                <input type="checkbox" id="{{item}}" value="{{item}}" v-model="CheckedItems"></input>
+                <input type="checkbox" id="{{item}}" value="{{item}}" v-model="CheckedItems" />
             </label>
         </template>
         <div>
             <span>CheckedItems: {{ CheckedItems | json }}</span>
         </div>
         <input v-model="integer">
-        <button v-on:click="Inc">Inc</button>
-        <button v-on:click="Repeat">Repeat</button>
-        <button v-on:click="PopulateTodo">PopulateTodo</button>
+        <button @click="Inc">Inc</button>
+        <button @click="Repeat">Repeat</button>
+        <button @click="PopulateTodo">PopulateTodo</button>
         <li v-for="item in list">
             {{ item }}
         </li>
-        <input v-model="str"></input>
+        <input v-model="str" />
         <ul v-for="todo in todos">
             <li>{{todo.time}} - {{todo.content}}</li>
         </ul>
diff --git a/examples/component/main.go b/examples/component/main.go
@@ -12,7 +12,7 @@ type Com struct {
 
 func (c *Com) Hello() {
 	println("hello" + c.Text)
-	vm := vue.Get(c)
+	vm := vue.GetVM(c)
 	println("vm from Hello:", vm)
 	println("vm.get:", vm.Get("text").String())
 }

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ func Extend(opt js.M) *Component {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-func RegisterComponent(name string, component *Component) {`
	`72`	`+func RegisterComponent(name string, component Component) Component {`
`73`	`73`	`vue.Call("component", name, component.Object)`
	`74`	`+ return component`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`func GetComponent(name string) *Component {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ type Com struct {`
`12`	`12`
`13`	`13`	`func (c *Com) Hello() {`
`14`	`14`	`println("hello" + c.Text)`
`15`		`- vm := vue.Get(c)`
	`15`	`+ vm := vue.GetVM(c)`
`16`	`16`	`println("vm from Hello:", vm)`
`17`	`17`	`println("vm.get:", vm.Get("text").String())`
`18`	`18`	`}`