获取官方更新

Author: dingyiming

src/v2/api/index.md

@@ -1023,7 +1023,7 @@ type: api
 
 - **用法：**
 
-  观察 Vue 实例变化的一个表达式或计算属性函数。回调函数的得到参数为新值和旧值。表达式可以是某个键路径或任意合法绑定表达式。
+  观察 Vue 实例变化的一个表达式或计算属性函数。回调函数得到的参数为新值和旧值。表达式只接受监督的键路径。对于更复杂的表达式，用一个函数取代。
 
   <p class="tip">注意：在变异（不是替换）对象或数组时，旧值将与新值相同，因为它们的引用指向同一个对象/数组。Vue 不会保留变异之前值的副本。</p>
 
@@ -1035,11 +1035,6 @@ type: api
     // 做点什么
   })
 
-  // 表达式
-  vm.$watch('a + b', function (newVal, oldVal) {
-    // 做点什么
-  })
-
   // 函数
   vm.$watch(
     function () {

src/v2/guide/index.md

@@ -14,7 +14,7 @@ Vue.js 的目标是通过尽可能简单的 API 实现**响应的数据绑定**
 
 ## 起步
 
-<p class="tip">The official guide assumes intermediate level front-end knowledge of HTML, CSS and JavaScript. If you are totally new to front-end development, it might not be the best idea to jump right into a framework as your first step - grasp the basics then come back! Prior experience with other frameworks helps, but is not required.</p>
+<p class="tip">The official guide assumes intermediate level knowledge of HTML, CSS, and JavaScript. If you are totally new to frontend development, it might not be the best idea to jump right into a framework as your first step - grasp the basics then come back! Prior experience with other frameworks helps, but is not required.</p>
 
 The easiest way to try out Vue.js is using the [JSFiddle Hello World 例子](https://jsfiddle.net/chrisvfritz/50wL7mdz/). Feel free to open it in another tab and follow along as we go through some basic examples. Or, you can simply create an `.html` file and include Vue with:
 
@@ -271,9 +271,7 @@ Vue.component('todo-item', {
 
 ``` html
 <ul>
-  <!--
-  Create an instance of the todo-item component
-  -->
+  <!-- Create an instance of the todo-item component -->
   <todo-item></todo-item>
 </ul>
 ```
@@ -295,11 +293,9 @@ Vue.component('todo-item', {
 ``` html
 <div id="app-7">
   <ol>
-    <!--
-    Now we provide each todo-item with the todo object
-    it's representing, so that its content can be dynamic
-    -->
-    <todo-item v-for="todo in todos" v-bind:todo="todo"></todo-item>
+    <!-- Now we provide each todo-item with the todo object    -->
+    <!-- it's representing, so that its content can be dynamic -->
+    <todo-item v-for="item in groceryList" v-bind:todo="item"></todo-item>
   </ol>
 </div>
 ```
@@ -309,21 +305,22 @@ Vue.component('todo-item', {
   props: ['todo'],
   template: '<li>{{ todo.text }}</li>'
 })
+
 var app7 = new Vue({
   el: '#app-7',
   data: {
-    todos: [
-      { text: 'Learn JavaScript' },
-      { text: 'Learn Vue' },
-      { text: 'Build something awesome' }
+    groceryList: [
+      { text: 'Vegetables' },
+      { text: 'Cheese' },
+      { text: 'Whatever else humans are supposed to eat' }
     ]
   }
 })
 ```
 {% raw %}
 <div id="app-7" class="demo">
   <ol>
-    <todo-item v-for="todo in todos" v-bind:todo="todo"></todo-item>
+    <todo-item v-for="item in groceryList" v-bind:todo="item"></todo-item>
   </ol>
 </div>
 <script>
@@ -334,10 +331,10 @@ Vue.component('todo-item', {
 var app7 = new Vue({
   el: '#app-7',
   data: {
-    todos: [
-      { text: 'Learn JavaScript' },
-      { text: 'Learn Vue' },
-      { text: 'Build something awesome' }
+    groceryList: [
+      { text: 'Vegetables' },
+      { text: 'Cheese' },
+      { text: 'Whatever else humans are supposed to eat' }
     ]
   }
 })

src/v2/guide/installation.md

@@ -6,7 +6,7 @@ vue_version: 2.0.5
 dev_size: "194.65"
 min_size: "64.28"
 gz_size: "23.55"
-ro_gz_size: "16"
+ro_gz_size: "16.39"
 ---
 
 ### 兼容性

themes/vue/layout/index.ejs

@@ -58,7 +58,6 @@
   Copyright &copy; 2014-<%- new Date().getFullYear() %> Evan You
 </div>
 
-<script src="/js/common.js"></script>
 <script>
 var topScrolled = false
 window.addEventListener('scroll', function () {

themes/vue/layout/layout.ejs

@@ -16,16 +16,17 @@
         <meta name="twitter:description" content="<%- theme.site_description %>">
         <meta name="twitter:image" content="https://<%- theme.root_domain %>/images/logo.png">
 
+        <link rel="icon" href="/images/logo.png" type="image/x-icon">
+
         <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto Mono' rel='stylesheet' type='text/css'>
         <link href='//fonts.googleapis.com/css?family=Dosis:500&text=Vue.js' rel='stylesheet' type='text/css'>
-        <link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
-        <link rel="icon" href="/images/logo.png" type="image/x-icon">
-        <script>
-            window.PAGE_TYPE = "<%- page.type %>"
-        </script>
+
+        <!-- main page styles -->
         <%- css(isIndex ? 'css/index' : 'css/page') %>
-        <%- partial('partials/ga') %>
+
+        <!-- this needs to be loaded before guide's inline scripts -->
         <script src="/js/vue.js"></script>
+        <script>window.PAGE_TYPE = "<%- page.type %>"</script>
     </head>
     <body class="<%- isIndex ? '' : 'docs' -%>">
         <div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
@@ -42,16 +43,49 @@
                 <% } %>
             </div>
             <script src="/js/smooth-scroll.min.js"></script>
-            <script src="/js/common.js"></script>
         <% } else { %>
             <%- body %>
         <% } %>
 
-        <script src="//cdn.bootcss.com/fastclick/1.0.6/fastclick.min.js"></script>
+        <!-- main custom script for sidebars, version selects etc. -->
+        <script src="/js/common.js"></script>
+
+        <!-- ga -->
+        <script>
+          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+          ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
+          ga('send', 'pageview');
+        </script>
+
+        <!-- search -->
+        <link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
+        <%- css('css/search') %>
+        <script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
+        <script>
+        [
+          '#search-query-nav',
+          '#search-query-sidebar'
+        ].forEach(function (selector) {
+          if (!document.querySelector(selector)) return
+          docsearch({
+            appId: 'BH4D9OD16A',
+            apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
+            indexName: 'vuejs',
+            inputSelector: selector
+          })
+        })
+        </script>
+
+        <!-- fastclick -->
+        <script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
         <script>
-            document.addEventListener('DOMContentLoaded', function() {
-                FastClick.attach(document.body);
-            }, false);
+        document.addEventListener('DOMContentLoaded', function() {
+          FastClick.attach(document.body)
+        }, false)
         </script>
     </body>
 </html>

themes/vue/source/css/index.styl

@@ -1,6 +1,5 @@
 @import "_common"
 @import "_header"
-@import "_search"
 @import '_sidebar'
 
 $width = 900px

themes/vue/source/css/page.styl

@@ -1,7 +1,6 @@
 @import "_common"
 @import "_header"
 @import "_demo"
-@import "_search"
 @import "_sponsor"
 @import "_migration"
 @import "_sidebar"
@@ -111,7 +110,7 @@
             font-weight bold
             font-family $logo-font
             font-size 14px
-            
+
         code
             background-color #efefef