获取官方更新

Author: dingyiming

src/v2/api/index.md

@@ -1017,7 +1017,7 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
 
 - **Usage:**
 
-  Watch an expression or a computed function on the Vue instance for changes. The callback gets called with the new value and the old value. The expression can be a single keypath or any valid binding expressions.
+  Watch an expression or a computed function on the Vue instance for changes. The callback gets called with the new value and the old value. The expression only accepts simple dot-delimited paths. For more complex expression, use a function instead.
 
 <p class="tip">Note: when mutating (rather than replacing) an Object or an Array, the old value will be the same as new value because they reference the same Object/Array. Vue doesn't keep a copy of the pre-mutate value.</p>
 
@@ -1029,11 +1029,6 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
     // do something
   })
 
-  // expression
-  vm.$watch('a + b', function (newVal, oldVal) {
-    // do something
-  })
-
   // function
   vm.$watch(
     function () {

src/v2/guide/index.md

@@ -12,7 +12,7 @@ If you are an experienced frontend developer and want to know how Vue compares t
 
 ## Getting Started
 
-<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 example](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 @@ Now you can compose it in another component's template:
 
 ``` 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 @@ Now we can pass the todo into each repeated component using `v-bind`:
 ``` 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>
 ```
@@ -308,21 +304,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>
@@ -333,10 +330,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"
 ---
 
 ### Compatibility Note

themes/vue/layout/index.ejs

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

themes/vue/layout/layout.ejs

@@ -17,16 +17,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,18 +43,50 @@
                     <%- body %>
                 <% } %>
             </div>
-            <script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
             <script src="/js/smooth-scroll.min.js"></script>
-            <script src="/js/common.js"></script>
         <% } else { %>
             <%- body %>
         <% } %>
 
+        <!-- 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/layout/partials/ga.ejs

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

themes/vue/source/css/index.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
 

themes/vue/source/css/page.styl

@@ -1,6 +1,5 @@
 (function () {
 
-  initSearch()
   initMobileMenu()
   if (PAGE_TYPE) {
     initVersionSelect()
@@ -74,25 +73,6 @@
     }
   }
 
-  /**
-   * Swiftype search box
-   */
-
-  function initSearch () {
-    [
-      '#search-query-nav',
-      '#search-query-sidebar'
-    ].forEach(function (selector) {
-      if (!document.querySelector(selector)) return
-      docsearch({
-        appId: 'BH4D9OD16A',
-        apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
-        indexName: 'vuejs',
-        inputSelector: selector
-      })
-    })
-  }
-
   /**
    * Mobile burger menu button for toggling sidebar
    */

themes/vue/source/css/_search.styl renamed to themes/vue/source/css/search.styl

@@ -13,7 +13,8 @@ fs.writeFileSync(
 var sizes = {
   dev: 'vue.js',
   min: 'vue.min.js',
-  gz: 'vue.min.js.gz'
+  gz: 'vue.min.js.gz',
+  ro_gz: 'vue.common.min.js.gz'
 }
 
 for (var file in sizes) {