Merge pull request volksbright#248 from vuejs/master

dingyiming · web-flow · commit e292624649ad · 2016-11-01T09:45:00.000+08:00
获取官方更新
diff --git a/src/guide/comparison.md b/src/guide/comparison.md
@@ -284,7 +284,7 @@ Vue is much less opinionated than Angular 2, offering official support for a var
 
 To get started with Vue, all you need is familiarity with HTML and ES5 JavaScript (i.e. plain JavaScript). With these basic skills, you can start building non-trivial applications within less than a day of reading [the guide](/guide).
 
-Angular 2's learning curve is much steeper. Even without TypeScript, their [Quickstart guide](https://angular.io/docs/js/latest/quickstart.html) starts out with an app that uses ES2015 JavaScript, NPM with 18 dependencies, 4 files, and over 3,000 words to explain it all - just to say Hello World. It's an understatement to say that [Vue's Hello World](index.html#Hello-World) is considerably simpler. It's so trivial in fact, that we don't even dedicate a whole page in the guide to it.
+Angular 2's learning curve is much steeper. Even without TypeScript, their [Quickstart guide](https://angular.io/docs/js/latest/quickstart.html) starts out with an app that uses ES2015 JavaScript, NPM with 18 dependencies, 4 files, and over 3,000 words to explain it all - just to say Hello World. It's an understatement to say that [Vue's Hello World](https://jsfiddle.net/chrisvfritz/50wL7mdz/) is considerably simpler. It's so trivial in fact, that we don't even dedicate a whole page in the guide to it.
 
 ## Ember
 
diff --git a/src/guide/computed.md b/src/guide/computed.md
@@ -94,7 +94,7 @@ methods: {
 }
 ```
 
-Instead of a computed property, we can define the same function as a method instead. For the end result, the two approaches are indeed exactly the same. However, the difference is that **computed properties are cached based on its dependencies.** A computed property will only re-evaluate when some of its dependencies have changed. This means as long as `message` has not changed, multiple access to the `reversedMessage` computed property will immediately return the previously computed result without having to run the function again.
+Instead of a computed property, we can define the same function as a method instead. For the end result, the two approaches are indeed exactly the same. However, the difference is that **computed properties are cached based on their dependencies.** A computed property will only re-evaluate when some of its dependencies have changed. This means as long as `message` has not changed, multiple access to the `reversedMessage` computed property will immediately return the previously computed result without having to run the function again.
 
 This also means the following computed property will never update, because `Date.now()` is not a reactive dependency:
 
diff --git a/src/guide/index.md b/src/guide/index.md
@@ -12,7 +12,7 @@ If you are an experienced frontend developer and want to know how Vue compares t
 
 ## Getting Started
 
-The easiest way to try out Vue.js is using the [JSFiddle Hello World example](https://jsfiddle.net/chrisvfritz/4tpzm3e1/). Feel free to open it in another tab and follow along as we go through some basic examples. If you prefer downloading / installing from a package manager, check out the [Installation](/guide/installation.html) page.
+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. If you prefer downloading / installing from a package manager, check out the [Installation](/guide/installation.html) page.
 
 ## Declarative Rendering
 
diff --git a/src/guide/instance.md b/src/guide/instance.md
@@ -94,7 +94,7 @@ var vm = new Vue({
 // -> "a is: 1"
 ```
 
-There are also other hooks which will be called at different stages of the instance's lifecycle, for example `mounted`, `updated`, and `destroyed`. All lifecycle hooks are called with their `this` context pointing to the Vue instance invoking it. Some users may have been wondering where the concept of "controllers" lives in the Vue world and the answer is: there are no controllers. Your custom logic for a component would be split among these lifecycle hooks.
+There are also other hooks which will be called at different stages of the instance's lifecycle, for example `mounted`, `updated`, and `destroyed`. All lifecycle hooks are called with their `this` context pointing to the Vue instance invoking it. You may have been wondering where the concept of "controllers" lives in the Vue world and the answer is: there are no controllers. Your custom logic for a component would be split among these lifecycle hooks.
 
 ## Lifecycle Diagram
 
diff --git a/src/support-vuejs/index.md b/src/support-vuejs/index.md
@@ -15,9 +15,7 @@
 <p style="text-align: center; padding-top: 30px; margin-bottom: 0"><a href="http://www.thedifferenceengine.io/"><img src="/images/tde.png" style="width: 300px"></a></p>
 
 <p style="text-align: center; margin-top: 0; margin-bottom: 60px" class="sponsors-page">
-  <a href="https://itunescn.com">
-    <img src="/images/itunescn.png">
-  </a><a href="https://jsfiddle.net">
+  <a href="https://jsfiddle.net">
     <img src="/images/jsfiddle.png">
   </a><a href="https://laravel.com">
     <img src="/images/laravel.png">
@@ -35,6 +33,10 @@
     <img src="/images/trisoft.png">
   </a><a href="http://actualize.co" target="_blank" style="width:180px">
     <img src="/images/actualize.png" style="width:180px">
+  </a><a href="https://www.2mhost.com/" target="_blank">
+    <img src="/images/2mhost.png">
+  </a><a href="https://vuejsjob.com/?ref=vuejs" target="_blank" style="position:relative;top:6px">
+    <img src="/images/vuejobs.png">
   </a>
 </p>
 
diff --git a/themes/vue/layout/partials/community_dropdown.ejs b/themes/vue/layout/partials/community_dropdown.ejs
@@ -5,5 +5,6 @@
     <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://twitter.com/vuejs" class="nav-link" target="_blank">Twitter</a></li>
+    <li><a href="https://vuejobs.com/?ref_source=vue" class="nav-link" target="_blank">Jobs</a></li>
   </ul>
 </li>
diff --git a/themes/vue/layout/partials/sponsors.ejs b/themes/vue/layout/partials/sponsors.ejs
@@ -1,9 +1,6 @@
 <a class="vip" href="http://www.thedifferenceengine.io/" target="_blank">
   <img src="/images/tde.png">
 </a>
-<a href="https://www.itunescn.com/" target="_blank" style="top:2px">
-  <img src="/images/itunescn.png">
-</a>
 <a href="https://jsfiddle.net/" target="_blank">
   <img src="/images/jsfiddle.png">
 </a>
@@ -31,3 +28,9 @@
 <a href="http://actualize.co/" target="_blank" style="width:144px;">
   <img src="/images/actualize.png" style="width:144px">
 </a>
+<a href="https://www.2mhost.com/" target="_blank" style="width:90px">
+  <img src="/images/2mhost.png" style="width:90px">
+</a>
+<a href="https://vuejsjob.com/?ref=vuejs" target="_blank" style="width:90px;top:5px">
+  <img src="/images/vuejobs.png" style="width:90px">
+</a>
diff --git a/themes/vue/source/images/2mhost.png b/themes/vue/source/images/2mhost.png
diff --git a/themes/vue/source/images/vuejobs.png b/themes/vue/source/images/vuejobs.png
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ methods: {`
`94`	`94`	`}`
`95`	`95`	```
`96`	`96`
`97`		-Instead of a computed property, we can define the same function as a method instead. For the end result, the two approaches are indeed exactly the same. However, the difference is that computed properties are cached based on its dependencies. A computed property will only re-evaluate when some of its dependencies have changed. This means as long as `message` has not changed, multiple access to the `reversedMessage` computed property will immediately return the previously computed result without having to run the function again.
	`97`	+Instead of a computed property, we can define the same function as a method instead. For the end result, the two approaches are indeed exactly the same. However, the difference is that computed properties are cached based on their dependencies. A computed property will only re-evaluate when some of its dependencies have changed. This means as long as `message` has not changed, multiple access to the `reversedMessage` computed property will immediately return the previously computed result without having to run the function again.
`98`	`98`
`99`	`99`	This also means the following computed property will never update, because `Date.now()` is not a reactive dependency:
`100`	`100`