Commit 4b56739

authored

Merge pull request vuejs#1 from vuefe/2.0-cn

merge

2 parents 20210a0 + 5172a05 commit 4b56739Copy full SHA for 4b56739

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ new Vue({`
`117`	`117`	```
`118`	`118`
`119`	`119`	`{% raw %}`
`120`		`-<div id="hook-arguments-example" v-demo:hello.a.b="message" class="demo"></div>`
	`120`	`+<div id="hook-arguments-example" v-demo:foo.a.b="message" class="demo"></div>`
`121`	`121`	`<script>`
`122`	`122`	`Vue.directive('demo', {`
`123`	`123`	`bind: function (el, binding, vnode) {`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,8 @@ Vue.config.keyCodes.f1 = 112`
`260`	`260`	`<div @click.ctrl="doSomething">Do something</div>`
`261`	`261`	```
`262`	`262`
	`263`	+<p class="tip">Note that modifier keys are different from regular keys and when used with `keyup` events, they have to be pressed when the event is emitted. In other words, `keyup.ctrl` will only trigger if you release a key while holding down `ctrl`. It won't trigger if you release the `ctrl` key alone.</p>
	`264`	`+`
`263`	`265`	`## 为什么在 HTML 中监听事件?`
`264`	`266`
`265`	`267`	你可能注意到这种事件监听的方式违背了关注点分离(separation of concern)传统理念。不必担心,因为所有的 Vue.js 事件处理方法和表达式都严格绑定在当前视图的 ViewModel 上,它不会导致任何维护上的困难。实际上,使用 `v-on` 有几个好处:

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ Vue.js 不支持 IE8 及其以下版本,因为 Vue.js 使用了 IE8 不能模`
`34`	`34`
`35`	`35`	`推荐:[unpkg](https://unpkg.com/vue/dist/vue.js), 会保持和 npm 发布的最新的版本一致。可以在 [unpkg.com/vue/](https://unpkg.com/vue/) 浏览 npm 包资源。`
`36`	`36`
`37`		`-也可以从 [jsDelivr](//cdn.jsdelivr.net/vue/{{vue_version}}/vue.js) 或 [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js)获取,不过这两个服务版本更新可能略滞后。`
	`37`	`+也可以从 [jsDelivr](//cdn.jsdelivr.net/vue/latest/vue.js) 或 [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js)获取,不过这两个服务版本更新可能略滞后。`
`38`	`38`
`39`	`39`	`## NPM`
`40`	`40`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<div id="header">`
`2`	`2`	`<a id="logo" href="/">`
`3`	`3`	`<img src="/images/logo.png">`
`4`		`- <span>Vue.js <span style="font-size: 12px;">(2017.02.12更新,合并vuejs.org更新!)</span></span>`
	`4`	`+ <span>Vue.js <span style="font-size: 12px;">(2017.02.19更新,合并vuejs.org更新!)</span></span>`
`5`	`5`	`</a>`
`6`	`6`	`<a style="`
`7`	`7`	`position: absolute;`

Comments

(0)