Merge pull request #289 from vuejs/master

获取官方更新

Author: dingyiming

src/v2/api/index.md

@@ -1570,7 +1570,7 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
 
 - **Usage:**
 
-  Create a two-way binding on a form input element or a component. For detailed usage, see guide section linked below.
+  Create a two-way binding on a form input element or a component. For detailed usage and other notes, see the Guide section linked below.
 
 - **See also:**
   - [Form Input Bindings](../guide/forms.html)

src/v2/guide/components.md

@@ -1015,7 +1015,7 @@ Vue.component(
 )
 ```
 
-<p class="tip">If you're a <strong>Browserify</strong> user that would like to use async components, it's unfortunately not possible and probably never will be, as its creator has [made it clear](https://github.com/substack/node-browserify/issues/58#issuecomment-21978224) that async loading "is not something that Browserify will ever support." If this is a feature that's important to you, we recommend using Webpack instead.</p>
+<p class="tip">If you're a <strong>Browserify</strong> user that would like to use async components, its creator has unfortunately [made it clear](https://github.com/substack/node-browserify/issues/58#issuecomment-21978224) that async loading "is not something that Browserify will ever support." Officially, at least. The Browserify community has found [some workarounds](https://github.com/vuejs/vuejs.org/issues/620), which may be helpful for existing and complex applications. For all other scenarios, we recommend simply using Webpack for built-in, first-class async support.</p>
 
 ### Component Naming Conventions
 

src/v2/guide/events.md

@@ -224,17 +224,29 @@ You can also [define custom key modifier aliases](../api/#keyCodes) via the glob
 Vue.config.keyCodes.f1 = 112
 ```
 
-## Mouse Event Modifiers
+## Modifier Keys
 
 > New in 2.1.0
 
-You can use the following modifiers to trigger mouse event listeners only when the corresponding key is pressed:
+You can use the following modifiers to trigger mouse or keyboard event listeners only when the corresponding modifier key is pressed:
 
 - `.ctrl`
 - `.alt`
 - `.shift`
 - `.meta`
 
+> Note: On Macintosh keyboards, meta is the command key (⌘). On Windows keyboards, meta is the windows key (⊞). On Sun Microsystems keyboards, meta is marked as a solid diamond (◆). On certain keyboards, specifically MIT and Lisp machine keyboards and successors, such as the Knight keyboard, space-cadet keyboard, meta is labeled “META”. On Symbolics keyboards, meta is labeled “META” or “Meta”.
+
+For example:
+
+```html
+<!-- Alt + C -->
+<input @keyup.alt.67="clear">
+
+<!-- Ctrl + Click -->
+<div @click.ctrl="doSomething">Do something</div>
+```
+
 ## Why Listeners in HTML?
 
 You might be concerned that this whole event listening approach violates the good old rules about "separation of concerns". Rest assured - since all Vue handler functions and expressions are strictly bound to the ViewModel that's handling the current view, it won't cause any maintenance difficulty. In fact, there are several benefits in using `v-on`:

src/v2/guide/forms.md

@@ -10,6 +10,8 @@ You can use the `v-model` directive to create two-way data bindings on form inpu
 
 <p class="tip">`v-model` doesn't care about the initial value provided to an input or a textarea. It will always treat the Vue instance data as the source of truth.</p>
 
+<p class="tip" id="vmodel-ime-tip">For languages that require an [IME](https://en.wikipedia.org/wiki/Input_method) (Chinese, Japanese, Korean etc.), you'll notice that `v-model` doesn't get updated during IME composition. If you want to cater for these updates as well, use `input` event instead.</p>
+
 ### Text
 
 ``` html
@@ -337,7 +339,7 @@ vm.selected.number // -> 123
 
 ### `.lazy`
 
-By default, `v-model` syncs the input with the data after each `input` event. You can add the `lazy` modifier to instead sync after `change` events:
+By default, `v-model` syncs the input with the data after each `input` event (with the exception of IME composition as [stated above](#vmodel-ime-tip)). You can add the `lazy` modifier to instead sync after `change` events:
 
 ``` html
 <!-- synced after "change" instead of "input" -->

themes/vue/layout/partials/community_dropdown.ejs

@@ -1,9 +1,29 @@
 <li class="nav-dropdown-container ecosystem">
   <a class="nav-link">Ecosystem</a><span class="arrow"></span>
   <ul class="nav-dropdown">
-    <li><a href="https://router.vuejs.org/" class="nav-link" target="_blank">vue-router</a></li>
-    <li><a href="https://vuex.vuejs.org/" class="nav-link" target="_blank">vuex</a></li>
-    <li><a href="https://github.com/vuejs/vue-cli" class="nav-link" target="_blank">vue-cli</a></li>
-    <li><a href="https://github.com/vuejs/awesome-vue" class="nav-link" target="_blank">awesome-vue</a></li>
+    <li><h4>Help</h4></li>
+    <li><ul>
+      <li><a href="http://forum.vuejs.org" class="nav-link" target="_blank">Forum</a></li>
+      <li><a href="https://gitter.im/vuejs/vue" class="nav-link" target="_blank">Chat</a></li>
+      <li><a href="https://github.com/vuejs-templates" class="nav-link" target="_blank">Templates</a></li>
+    </ul></li>
+    <li><h4>News</h4></li>
+    <li><ul>
+      <li><a href="https://twitter.com/vuejs" class="nav-link" target="_blank">Twitter</a></li>
+      <li><a href="https://medium.com/the-vue-point" class="nav-link" target="_blank">Blog</a></li>
+      <li><a href="https://vuejsjob.com/?ref=vuejs" class="nav-link" target="_blank">Jobs</a></li>
+    </ul></li>
+    <li><h4>Core Plugins</h4></li>
+    <li><ul>
+      <li><a href="https://router.vuejs.org/" class="nav-link" target="_blank">Vue Router</a></li>
+      <li><a href="https://vuex.vuejs.org/" class="nav-link" target="_blank">Vuex</a></li>
+    </ul></li>
+    <li><h4>Resource Lists</h4></li>
+    <li><ul>
+      <li><a href="https://github.com/vuejs" class="nav-link" target="_blank">Official Repos</a></li>
+      <li><a href="https://github.com/vuejs/awesome-vue" class="nav-link" target="_blank">Awesome Vue</a></li>
+    </ul></li>
   </ul>
 </li>
+
+

themes/vue/layout/partials/ecosystem_dropdown.ejs

@@ -1,5 +1,5 @@
 <li class="nav-dropdown-container language">
-  <a class="nav-link">Language</a><span class="arrow"></span>
+  <a class="nav-link">Translations</a><span class="arrow"></span>
   <ul class="nav-dropdown">
     <li><a href="https://cn.vuejs.org/" class="nav-link" target="_blank">中文</a></li>
     <li><a href="https://jp.vuejs.org/" class="nav-link" target="_blank">日本語</a></li>

themes/vue/layout/partials/language_dropdown.ejs

@@ -6,7 +6,5 @@
 <li><a href="/v2/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Guide</a></li>
 <li><a href="/v2/api/" class="nav-link<%- page.path.match(/api/) ? ' current' : '' %>">API</a></li>
 <li><a href="/v2/examples/" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">Examples</a></li>
-<li><a href="https://medium.com/the-vue-point" target="_blank" class="nav-link<%- page.path.match(/blog/) ? ' current' : '' %>">Blog</a></li>
-<%- partial('partials/community_dropdown') %>
 <%- partial('partials/ecosystem_dropdown') %>
 <%- partial('partials/language_dropdown') %>

themes/vue/layout/partials/main_menu.ejs

@@ -150,13 +150,18 @@ a.button
         &:hover
             .nav-dropdown
                 display block
-        &.ecosystem, &.language
+        &.language
             margin-left 20px
+        .arrow
+            pointer-events none
     .nav-dropdown
         display none
+        box-sizing border-box
+        max-height "calc(100vh - %s)" % $header-height
+        overflow-y scroll
         position absolute
         top 100%
-        left 0
+        right -15px
         background-color #fff
         padding 10px 0
         border 1px solid #ddd
@@ -168,11 +173,24 @@ a.button
             line-height 1.8em
             margin 0
             display block
+            > ul
+                padding-left: 0
+            &:first-child
+                h4
+                    margin-top 0
+                    padding-top: 0
+                    border-top: 0
+        a, h4
+            padding 0 24px 0 20px
+        h4
+            // text-transform uppercase
+            margin .45em 0 0
+            padding-top: .45em
+            border-top: 1px solid #eee
         a
-            color $light
+            color lighten($dark, 10%)
             font-size .9em
             display block
-            padding 0 24px 0 20px
             &:hover
                 color $green
     .arrow

themes/vue/source/css/_common.styl

@@ -75,6 +75,10 @@
         padding 4px 0
         text-align center
         margin-bottom 20px
+    .nav-dropdown
+        h4
+            font-weight normal
+            margin: 0
 
 @media screen and (max-width: 900px)
     .sidebar