From 58aee7a38ada4097e905d063c51bc028d7ae8699 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Sun, 27 Sep 2015 02:34:13 +0900 Subject: [PATCH 1/6] Fix assets option name on component guide --- source/guide/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/guide/components.md b/source/guide/components.md index 9702925bf6..2aada3402f 100644 --- a/source/guide/components.md +++ b/source/guide/components.md @@ -567,7 +567,7 @@ var MyComponent = Vue.extend({ partials: { // ... }, - effects: { + transitions: { // ... } }) From ed69b0311b1570e25e050e1f496d17a12793f0d0 Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 30 Sep 2015 11:10:51 -0400 Subject: [PATCH 2/6] fix typo (close #129) --- source/api/options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/api/options.md b/source/api/options.md index 50c0f6e391..7095d44831 100644 --- a/source/api/options.md +++ b/source/api/options.md @@ -97,7 +97,7 @@ Vue.component('prop-validation-demo', { The following component usage will result in two warnings: type mismatch for "size", and missing required prop "name". ``` html - + ``` From fcb21da2090bd6f0e81f256ff24ed790b914158c Mon Sep 17 00:00:00 2001 From: Jeroen Noten Date: Thu, 8 Oct 2015 12:53:48 +0200 Subject: [PATCH 3/6] Fix typo in FAQ --- source/guide/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/guide/faq.md b/source/guide/faq.md index 6351cc26bf..0fd0fcad45 100644 --- a/source/guide/faq.md +++ b/source/guide/faq.md @@ -15,7 +15,7 @@ order: 16 2. You cannot define your own getter/setters on data objects. This isn't much of a problem because data objects are expected to be obtained from plain JSON and Vue.js provides computed properties. - 3. Vue.js adds a few extra properties/methods to obsesrved objects: `__ob__`, `$add`, `$set` and `$delete`. These properties are inenumberable so they will not show up in `for ... in ...` loops. However if you overwrite them things will likely break. + 3. Vue.js adds a few extra properties/methods to observed objects: `__ob__`, `$add`, `$set` and `$delete`. These properties are inenumberable so they will not show up in `for ... in ...` loops. However if you overwrite them things will likely break. That's pretty much it. Accessing properties on the object is the same as before, `JSON.stringify` and `for ... in ...` loops will work as normal. 99.9% of the time you don't even need to think about it. From 2dc2cc17d9a5a57181838354c142463febc38d79 Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 8 Oct 2015 12:25:15 -0400 Subject: [PATCH 4/6] fix custom filter code example (close #131) --- source/guide/custom-filter.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/source/guide/custom-filter.md b/source/guide/custom-filter.md index 308928835c..f984168c45 100644 --- a/source/guide/custom-filter.md +++ b/source/guide/custom-filter.md @@ -37,18 +37,16 @@ Up till now we have used filters to transform values coming from the model and b ``` js Vue.filter('currencyDisplay', { - currencyDisplay: { - // model -> view - // formats the value when updating the input element. - read: function(val) { - return '$'+val.toFixed(2) - }, - // view -> model - // formats the value when updating the data. - write: function(val, oldVal) { - var number = +val.replace(/[^\d.]/g, '') - return isNaN(number) ? 0 : number - } + // model -> view + // formats the value when updating the input element. + read: function(val) { + return '$'+val.toFixed(2) + }, + // view -> model + // formats the value when updating the data. + write: function(val, oldVal) { + var number = +val.replace(/[^\d.]/g, '') + return isNaN(number) ? 0 : number } }) ``` From 22d8ecdb06953f4492aa2e3d64625f32fa99ec92 Mon Sep 17 00:00:00 2001 From: Jim Fitzpatrick Date: Mon, 12 Oct 2015 21:02:25 -0400 Subject: [PATCH 5/6] Fix typo --- source/guide/best-practices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/guide/best-practices.md b/source/guide/best-practices.md index c6a84bf942..3d5652af09 100644 --- a/source/guide/best-practices.md +++ b/source/guide/best-practices.md @@ -43,7 +43,7 @@ As mentioned above, Vue observes data by converting properties with `Object.defi These methods can be used to add / delete properties from observed objects while triggering the desired DOM updates. The difference between `$add` and `$set` is that `$add` will return early if the key already exists on the object, so just calling `obj.$add(key)` won’t overwrite the existing value with `undefined`. -A related note is that when you change a data-bound Array directly by setting indices (e.g. `arr[1] = value`), Vue will not be able to pick up the change. Again, you can use augmented methods to notify Vue.js about those changes. Observerd Arrays are augmented with two methods: +A related note is that when you change a data-bound Array directly by setting indices (e.g. `arr[1] = value`), Vue will not be able to pick up the change. Again, you can use augmented methods to notify Vue.js about those changes. Observed Arrays are augmented with two methods: - `arr.$set(index, value)` - `arr.$remove(index | value)` From 7c388a9c44919199e0bf0cd4127de32b51289b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B9=E3=83=8E=E3=83=AB?= Date: Fri, 16 Oct 2015 18:19:32 +0800 Subject: [PATCH 6/6] add missed function () --- source/guide/computed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/guide/computed.md b/source/guide/computed.md index bf306b732f..b49f5ae26b 100644 --- a/source/guide/computed.md +++ b/source/guide/computed.md @@ -82,7 +82,7 @@ var vm = new Vue({ msg: 'hi' }, computed: { - example: { + example: function () { return Date.now() + this.msg } }