Skip to content

Commit a635000

Browse files
committed
[release] 1.0.0-alpha.2
1 parent 8c758bc commit a635000

File tree

3 files changed

+17
-26
lines changed

3 files changed

+17
-26
lines changed

dist/vue.js

+12-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.0-alpha.1
2+
* Vue.js v1.0.0-alpha.2
33
* (c) 2015 Evan You
44
* Released under the MIT License.
55
*/
@@ -1817,13 +1817,6 @@ return /******/ (function(modules) { // webpackBootstrap
18171817
)
18181818
},
18191819

1820-
COMPUTED_CACHE: function (name) {
1821-
warn(
1822-
'Computed property "' + name + '": computed properties are not cached by ' +
1823-
'default in 1.0.0. You only need to enable cache for particularly expensive ones.'
1824-
)
1825-
},
1826-
18271820
BIND_IS: function () {
18281821
warn(
18291822
'<component is="{{view}}"> syntax will be deprecated in 1.0.0. Use ' +
@@ -1989,6 +1982,10 @@ return /******/ (function(modules) { // webpackBootstrap
19891982
*/
19901983

19911984
exports.use = function (plugin) {
1985+
/* istanbul ignore if */
1986+
if (plugin.installed) {
1987+
return
1988+
}
19921989
// additional parameters
19931990
var args = _.toArray(arguments, 1)
19941991
args.unshift(this)
@@ -1997,6 +1994,7 @@ return /******/ (function(modules) { // webpackBootstrap
19971994
} else {
19981995
plugin.apply(null, args)
19991996
}
1997+
plugin.installed = true
20001998
return this
20011999
}
20022000

@@ -3665,8 +3663,7 @@ return /******/ (function(modules) { // webpackBootstrap
36653663

36663664
Watcher.prototype.get = function () {
36673665
this.beforeGet()
3668-
var vm = this.vm
3669-
var scope = this.scope || vm
3666+
var scope = this.scope || this.vm
36703667
var value
36713668
try {
36723669
value = this.getter.call(scope, scope)
@@ -3694,7 +3691,7 @@ return /******/ (function(modules) { // webpackBootstrap
36943691
value = this.preProcess(value)
36953692
}
36963693
if (this.filters) {
3697-
value = vm._applyFilters(value, null, this.filters, false)
3694+
value = scope._applyFilters(value, null, this.filters, false)
36983695
}
36993696
this.afterGet()
37003697
return value
@@ -3707,10 +3704,9 @@ return /******/ (function(modules) { // webpackBootstrap
37073704
*/
37083705

37093706
Watcher.prototype.set = function (value) {
3710-
var vm = this.vm
3711-
var scope = this.scope || vm
3707+
var scope = this.scope || this.vm
37123708
if (this.filters) {
3713-
value = vm._applyFilters(
3709+
value = scope._applyFilters(
37143710
value, this.value, this.filters, true)
37153711
}
37163712
try {
@@ -10035,16 +10031,11 @@ return /******/ (function(modules) { // webpackBootstrap
1003510031
configurable: true
1003610032
}
1003710033
if (typeof userDef === 'function') {
10038-
def.get = _.bind(userDef, this)
10034+
def.get = makeComputedGetter(userDef, this)
1003910035
def.set = noop
1004010036
} else {
10041-
10042-
if (("development") !== 'production' && userDef.cache === false) {
10043-
_.deprecation.COMPUTED_CACHE(key)
10044-
}
10045-
1004610037
def.get = userDef.get
10047-
? userDef.cache
10038+
? userDef.cache !== false
1004810039
? makeComputedGetter(userDef.get, this)
1004910040
: _.bind(userDef.get, this)
1005010041
: noop

0 commit comments

Comments
 (0)