Merge remote-tracking branch 'upstream/master'

Author: kazupon

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
-node_modules
+Thumbs.db
 db.json
-public
-.deploy
-debug.log
+*.log
+node_modules/
+public/
+.deploy*/

README.md

@@ -4,10 +4,10 @@ This site is built with [hexo](http://zespia.tw/hexo/). Site content is written
 
 ## Developing
 
-Start a dev server at `localhost:4000`:
+Make sure you are using **hexo 3.0**. Start a dev server at `localhost:4000`:
 
 ```
-$ npm install -g hexo
+$ npm install -g hexo-cli
 $ npm install
 $ hexo server
 ```

_config.yml

@@ -96,5 +96,5 @@ markdown:
 # Deployment
 ## Docs: http://zespia.tw/hexo/docs/deployment.html
 deploy:
-  type: github
+  type: git
   repository: git@github.com:vuejs/vuejs.org.git

package.json

@@ -1,10 +1,20 @@
 {
-  "name": "hexo",
-  "version": "2.8.3",
+  "name": "vuejs.org",
+  "version": "0.11.5",
   "private": true,
+  "hexo": {
+    "version": "3.0.0-rc.4"
+  },
   "dependencies": {
+    "hexo": "3.0.0-rc.4",
+    "hexo-deployer-git": "0.0.3",
+    "hexo-generator-archive": "^0.1.0",
+    "hexo-generator-category": "^0.1.0",
+    "hexo-generator-index": "^0.1.0",
+    "hexo-generator-tag": "^0.1.0",
     "hexo-renderer-ejs": "^0.1.0",
-    "hexo-renderer-marked": "^0.1.0",
-    "hexo-renderer-stylus": "^0.1.0"
+    "hexo-renderer-marked": "^0.2.4",
+    "hexo-renderer-stylus": "^0.2.0",
+    "hexo-server": "^0.1.2"
   }
 }

source/_posts/011-component.md

@@ -23,7 +23,7 @@ Vue.component('my-component', {
 ```
 
 ``` html
-<my-component params="{&#123;params&#125;}"></my-component>
+<my-component params="{{params}}"></my-component>
 ```
 
 ### Where Does It Belong?

source/api/directives.md

@@ -162,7 +162,7 @@ When no argument is provided, the child ViewModel will directly use the assigned
 ``` html
 <ul>
   <li v-repeat="users">
-    {&#123;name&#125;} {&#123;email&#125;}
+    {{name}} {{email}}
   </li>
 </ul>
 ```
@@ -172,7 +172,7 @@ If an argument is provided, a wrapper data object will always be created, using
 ``` html
 <ul>
   <li v-repeat="user : users">
-    {&#123;user.name&#125;} {&#123;user.email&#125;}
+    {{user.name}} {{user.email}}
   </li>
 </ul>
 ```
@@ -201,7 +201,7 @@ Example inheriting an object:
 ``` html
 <my-component v-with="user">
   <!-- you can access properties without `user.` -->
-  {&#123;name&#125;} {&#123;email&#125;}
+  {{name}} {{email}}
 </my-component>
 ```
 
@@ -210,7 +210,7 @@ Example inheriting individual properties (using the same data):
 ``` 
 <my-component v-with="myName: user.name, myEmail: user.email">
   <!-- you can access properties with the new keys -->
-  {&#123;myName&#125;} {&#123;myEmail&#125;}
+  {{myName}} {{myEmail}}
 </my-component>
 ```
 
@@ -258,13 +258,13 @@ Using the mustache tag inside `v-partial` makes it reactive:
 
 ``` html
 <!-- content will change based on vm.partialId -->
-<div v-partial="{&#123;partialId&#125;}"></div>
+<div v-partial="{{partialId}}"></div>
 ```
 
 You can also use this syntax (which doesn't support reactivity):
 
 ``` html
-<div>&#123;&#123;> my-partial&#125;&#125;</div>
+<div>{{> my-partial}}</div>
 ```
 
 ### v-transition

source/api/filters.md

@@ -32,14 +32,14 @@ Pluralizes the argument based on the filtered value. When there is exactly one a
 **Example:**
 
 ``` html
-{{count}} {{count | pluralize item}}
+{{count}} {{count | pluralize item}}
 ```
 
 *1 => '1 item'*  
 *2 => '2 items'*
 
 ``` html
-{{date}}{{date | pluralize st nd rd th}}
+{{date}}{{date | pluralize st nd rd th}}
 ```
 
 Will result in:
@@ -57,7 +57,7 @@ Will result in:
 JSON.stringify() incoming value rather than outputting the string representation (i.e. `[object Object]`). It also takes one optional argument which is the indent level (defaults to 2):
 
 ``` html
-<pre>{&#123;$data | json 4&#125;}</pre>
+<pre>{{$data | json 4}}</pre>
 ```
 
 ### key
@@ -96,7 +96,7 @@ Make `v-repeat` only display a filtered version of the source Array. The `search
 ``` html
 <input v-model="searchText">
 <ul>
-  <li v-repeat="users | filterBy searchText">{&#123;name&#125;}</li>
+  <li v-repeat="users | filterBy searchText">{{name}}</li>
 </ul>
 ```
 
@@ -107,7 +107,7 @@ Optionally, you can narrow down which specific property to search in with the op
 ``` html
 <input v-model="searchText">
 <ul>
-  <li v-repeat="users | filterBy searchText in name">{&#123;name&#125;}</li>
+  <li v-repeat="users | filterBy searchText in name">{{name}}</li>
 </ul>
 ```
 
@@ -117,7 +117,7 @@ Finally, you can use quotes to indicate literal arguments:
 
 ``` html
 <ul>
-  <li v-repeat="users | filterBy '555' in 'phone'">{&#123;name&#125;}</li>
+  <li v-repeat="users | filterBy '555' in 'phone'">{{name}}</li>
 </ul>
 ```
 
@@ -132,7 +132,7 @@ Sort `v-repeat`'s displayed result. The `sortKey` argument is a property key on
 
 ``` html
 <ul>
-  <li v-repeat="users | orderBy field reverse">{&#123;name&#125;}</li>
+  <li v-repeat="users | orderBy field reverse">{{name}}</li>
 </ul>
 ```
 
@@ -150,6 +150,6 @@ You can also use quotes for literal sort key. To indicate a literal reverse, use
 
 ``` html
 <ul>
-  <li v-repeat="users | orderBy 'name' -1">{&#123;name&#125;}</li>
+  <li v-repeat="users | orderBy 'name' -1">{{name}}</li>
 </ul>
 ```

source/api/global-api.md

@@ -16,7 +16,7 @@ order: 5
   // interpolation delimiters
   // for HTML interpolations, add
   // 1 extra outer-most character.
-  delimiters: ['{{', '}}'],
+  delimiters: ['{{', '}}'],
   // suppress warnings?
   silent: false,
   // interpolate mustache bindings?
@@ -65,7 +65,7 @@ var Profile = Vue.extend({
   el: function () {
     return document.createElement('p')
   },
-  template: '{{firstName}} {{lastName}} aka {{alias}}'
+  template: '{{firstName}} {{lastName}} aka {{alias}}'
 })
 var profile = new Profile({
   data: {
@@ -124,14 +124,14 @@ HTML
 
 ``` html
 <div id="demo">
-  &#123;&#123;> avatar&#125;&#125;
+  {{> avatar}}
 </div>
 ```
 
 JavaScript
 
 ``` js
-Vue.partial('avatar', '&lt;img v-attr="src:avatarURL"&gt;')
+Vue.partial('avatar', '<img v-attr="src:avatarURL">')
 
 new Vue({
   el: '#demo',

source/api/instance-methods.md

@@ -90,7 +90,7 @@ Evaluate a piece of template string containing mustache interpolations. Note tha
 
 ``` js
 // assuming vm.msg = 'hello'
-vm.$interpolate('{{msg}} world!') // -> 'hello world!'
+vm.$interpolate('{{msg}} world!') // -> 'hello world!'
 ```
 
 ### vm.$log( [keypath] )

source/api/options.md

@@ -128,7 +128,7 @@ Vue.component('param-demo', {
 Param attributes can also contain interpolation tags. The interpolation will be evaluated against the parent, and under the hood they will be compiled as [`v-with`](/api/directives.html#v-with), which means when the value of the interpolated expression changes, the component's corresponding property will also be updated:
 
 ``` html
-<param-demo message="{&#123;parentMessage&#125;}"></param-demo>
+<param-demo message="{{parentMessage}}"></param-demo>
 ```
 
 #### Notes on hyphened attributes

source/guide/application.md

@@ -34,7 +34,7 @@ You can implement some rudimentary routing logic by manually listening on hashch
 
 ``` html
 <div id="app">
-  <div v-component="{&#123;currentView&#125;}"></div>
+  <div v-component="{{currentView}}"></div>
 </div>
 ```
 

source/guide/components.md

@@ -83,7 +83,7 @@ When given a single keypath without an argument, the corresponding value on the
 ``` js
 // registering the component first
 Vue.component('user-profile', {
-  template: '{&#123;name&#125;}<br>{&#123;email&#125;}'
+  template: '{{name}}<br>{{email}}'
 })
 // the `user` object will be passed to the child
 // component as its $data
@@ -139,7 +139,7 @@ new Vue({
   },
   components: {
     child: {
-      template: '<span>{&#123;childMsg&#125;}</span>'
+      template: '<span>{{childMsg}}</span>'
     }
   }
 })
@@ -184,7 +184,7 @@ new Vue({
       paramAttributes: ['child-msg'],
       // dashed attributes are camelized,
       // so 'child-msg' becomes 'this.childMsg'
-      template: '<span>{&#123;childMsg&#125;}</span>'
+      template: '<span>{{childMsg}}</span>'
     }
   }
 })
@@ -268,15 +268,15 @@ new Vue({
 ```
 
 ``` html
-<div v-component="{&#123;currentView&#125;}">
+<div v-component="{{currentView}}">
   <!-- content changes when vm.currentview changes! -->
 </div>
 ```
 
 If you want to keep the switched-out components alive so that you can preserve its state or avoid re-rendering, you can add a `keep-alive` directive param:
 
 ``` html
-<div v-component="{&#123;currentView&#125;}" keep-alive>
+<div v-component="{{currentView}}" keep-alive>
   <!-- inactive components will be cached! -->
 </div>
 ```

source/guide/custom-filter.md

@@ -64,7 +64,7 @@ Vue.filter('concat', function (value, key) {
 ```
 ``` html
 <input v-model="userInput">
-<span>{&#123;msg | concat userInput&#125;}</span>
+<span>{{msg | concat userInput}}</span>
 ```
 
 For this simple example above, you can achieve the same result with just an expression, but for more complicated procedures that need more than one statements, you need to put them either in a computed property or a custom filter.

source/guide/directives.md

@@ -71,7 +71,7 @@ Here `"my-component"` is not a data property - it's a string ID that Vue.js uses
 You can also use mustache expressions inside literal directives. For example, the following code allows you to dynamically resolve the type of component you want to use:
 
 ``` html
-<div v-component="{&#123; isOwner ? 'owner-panel' : 'guest-panel' &#125;}"></div>
+<div v-component="{{ isOwner ? 'owner-panel' : 'guest-panel' }}"></div>
 ```
 
 When the expression inside the mustaches change, the rendered component will also change accordingly!

source/guide/filters.md

@@ -22,21 +22,21 @@ Filters must be placed at the end of a directive's value:
 You can also use them inside mustache-style bindings:
 
 ``` html
-<span>&#123;&#123;message | uppercase&#125;&#125;</span>
+<span>{{message | uppercase}}</span>
 ```
 
 Multiple filters can be chained together:
 
 ``` html
-<span>&#123;&#123;message | lowercase | reverse&#125;&#125;</span>
+<span>{{message | lowercase | reverse}}</span>
 ```
 
 ## Arguments
 
 Some filters can take optional arguments. Simply add arguments separated by spaces:
 
 ``` html
-<span>&#123;&#123;order | pluralize st nd rd th&#125;&#125;</span>
+<span>{{order | pluralize st nd rd th}}</span>
 ```
 
 ``` html

source/guide/forms.md

@@ -14,26 +14,26 @@ You can use the `v-model` directive to create two-way data bindings on form inpu
   <!-- text -->
   <p>
     <input type="text" v-model="msg">
-    {&#123;msg&#125;}
+    {{msg}}
   </p>
   <!-- checkbox -->
   <p>
     <input type="checkbox" v-model="checked">
-    {&#123;checked ? &quot;yes&quot; : &quot;no&quot;&#125;}
+    {{checked ? "yes" : "no"}}
   </p>
   <!-- radio buttons -->
   <p>
     <input type="radio" name="picked" value="one" v-model="picked">
     <input type="radio" name="picked" value="two" v-model="picked">
-    {&#123;picked&#125;}
+    {{picked}}
   </p>
   <!-- select -->
   <p>
     <select v-model="selected">
       <option>one</option>
       <option>two</option>
     </select>
-    {&#123;selected&#125;}
+    {{selected}}
   </p>
   <!-- multiple select -->
   <p>
@@ -42,9 +42,9 @@ You can use the `v-model` directive to create two-way data bindings on form inpu
       <option>two</option>
       <option>three</option>
     </select>
-    {&#123;multiSelect&#125;}
+    {{multiSelect}}
   </p>
-  <p><pre>data: {&#123;$data | json 2&#125;}</pre></p>
+  <p><pre>data: {{$data | json 2}}</pre></p>
 </form>
 ```