1
1
/*!
2
- * Vue.js v1.0.0-alpha.1
2
+ * Vue.js v1.0.0-alpha.2
3
3
* (c) 2015 Evan You
4
4
* Released under the MIT License.
5
5
*/
@@ -1817,13 +1817,6 @@ return /******/ (function(modules) { // webpackBootstrap
1817
1817
)
1818
1818
} ,
1819
1819
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
-
1827
1820
BIND_IS : function ( ) {
1828
1821
warn (
1829
1822
'<component is="{{view}}"> syntax will be deprecated in 1.0.0. Use ' +
@@ -1989,6 +1982,10 @@ return /******/ (function(modules) { // webpackBootstrap
1989
1982
*/
1990
1983
1991
1984
exports . use = function ( plugin ) {
1985
+ /* istanbul ignore if */
1986
+ if ( plugin . installed ) {
1987
+ return
1988
+ }
1992
1989
// additional parameters
1993
1990
var args = _ . toArray ( arguments , 1 )
1994
1991
args . unshift ( this )
@@ -1997,6 +1994,7 @@ return /******/ (function(modules) { // webpackBootstrap
1997
1994
} else {
1998
1995
plugin . apply ( null , args )
1999
1996
}
1997
+ plugin . installed = true
2000
1998
return this
2001
1999
}
2002
2000
@@ -3665,8 +3663,7 @@ return /******/ (function(modules) { // webpackBootstrap
3665
3663
3666
3664
Watcher . prototype . get = function ( ) {
3667
3665
this . beforeGet ( )
3668
- var vm = this . vm
3669
- var scope = this . scope || vm
3666
+ var scope = this . scope || this . vm
3670
3667
var value
3671
3668
try {
3672
3669
value = this . getter . call ( scope , scope )
@@ -3694,7 +3691,7 @@ return /******/ (function(modules) { // webpackBootstrap
3694
3691
value = this . preProcess ( value )
3695
3692
}
3696
3693
if ( this . filters ) {
3697
- value = vm . _applyFilters ( value , null , this . filters , false )
3694
+ value = scope . _applyFilters ( value , null , this . filters , false )
3698
3695
}
3699
3696
this . afterGet ( )
3700
3697
return value
@@ -3707,10 +3704,9 @@ return /******/ (function(modules) { // webpackBootstrap
3707
3704
*/
3708
3705
3709
3706
Watcher . prototype . set = function ( value ) {
3710
- var vm = this . vm
3711
- var scope = this . scope || vm
3707
+ var scope = this . scope || this . vm
3712
3708
if ( this . filters ) {
3713
- value = vm . _applyFilters (
3709
+ value = scope . _applyFilters (
3714
3710
value , this . value , this . filters , true )
3715
3711
}
3716
3712
try {
@@ -10035,16 +10031,11 @@ return /******/ (function(modules) { // webpackBootstrap
10035
10031
configurable : true
10036
10032
}
10037
10033
if ( typeof userDef === 'function' ) {
10038
- def . get = _ . bind ( userDef , this )
10034
+ def . get = makeComputedGetter ( userDef , this )
10039
10035
def . set = noop
10040
10036
} else {
10041
-
10042
- if ( ( "development" ) !== 'production' && userDef . cache === false ) {
10043
- _ . deprecation . COMPUTED_CACHE ( key )
10044
- }
10045
-
10046
10037
def . get = userDef . get
10047
- ? userDef . cache
10038
+ ? userDef . cache !== false
10048
10039
? makeComputedGetter ( userDef . get , this )
10049
10040
: _ . bind ( userDef . get , this )
10050
10041
: noop
0 commit comments