8000 Merge remote-tracking branch 'upstream/dev' into dev · zhangking/vue@1f7a45a · GitHub
[go: up one dir, main page]
Skip to content

Commit 1f7a45a

Browse files
fergaldoylefergaldoyle
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 1d85fcb + 7244c69 commit 1f7a45a

File tree

9 files changed

+64
-25
lines changed

9 files changed

+64
-25
lines changed

‎src/compiler/compile-props.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,10 @@ function makePropsLinkFn (props) {
192192
}
193193
} else if (prop.optimizedLiteral) {
194194
// optimized literal, cast it and just set once
195-
raw = _.stripQuotes(raw)
196-
value = _.toBoolean(_.toNumber(raw))
195+
var stripped = _.stripQuotes(raw)
196+
value = stripped === raw
197+
? _.toBoolean(_.toNumber(raw))
198+
: stripped
197199
_.initProp(vm, prop, value)
198200
} else {
199201
// string literal, but we need to cater for

‎src/compiler/compile.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,6 @@ function compileDirectives (attrs, options) {
662662
}
663663

664664
if (dirDef) {
665-
if (_.isLiteral(value)) {
666-
value = _.stripQuotes(value)
667-
modifiers.literal = true
668-
}
669665
pushDir(dirName, dirDef)
670666
}
671667
}

‎src/directives/internal/component.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ module.exports = {
132132
self.transition(newComponent, cb)
133133
})
134134
} else {
135+
// update ref for kept-alive component
136+
if (cached) {
137+
newComponent._updateRef()
138+
}
135139
this.transition(newComponent, cb)
136140
}
137141
},
@@ -241,6 +245,10 @@ module.exports = {
241245
}
242246
var child = this.childVM
243247
if (!child || this.keepAlive) {
248+
if (child) {
249+
// remove ref
250+
child._updateRef(true)
251+
}
244252
return
245253
}
246254
// the sole purpose of `deferCleanup` is so that we can

‎src/directives/public/for.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,11 +495,8 @@ module.exports = {
495495
}
496496
return res
497497
} else {
498-
var type = typeof value
499-
if (type === 'number') {
498+
if (typeof value === 'number') {
500499
value = range(value)
501-
} else if (type === 'string') {
502-
value = _.toArray(value)
503500
}
504501
return value || []
505502
}

‎src/instance/init.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,16 @@ exports._init = function (options) {
7979
this.$parent.$children.push(this)
8080
}
8181

82-
// set ref
83-
if (options._ref) {
84-
(this._scope || this._context).$refs[options._ref] = this
85-
}
86-
8782
// merge options.
8883
options = this.$options = mergeOptions(
8984
this.constructor.options,
9085
options,
9186
this
9287
)
9388

89+
// set ref
90+
this._updateRef()
91+
9492
// initialize data as empty object.
9593
// it will be filled up in _initScope().
9694
this._data = {}

‎src/instance/lifecycle.js

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@ var _ = require('../util')
22
var Directive = require('../directive')
33
var compiler = require('../compiler')
44

5+
/**
6+
* Update v-ref for component.
7+
*
8+
* @param {Boolean} remove
9+
*/
10+
11+
exports._updateRef = function (remove) {
12+
var ref = this.$options._ref
13+
if (ref) {
14+
var refs = (this._scope || this._context).$refs
15+
if (remove) {
16+
if (refs[ref] === this) {
17+
refs[ref] = null
18+
}
19+
} else {
20+
refs[ref] = this
21+
}
22+
}
23+
}
24+
525
/**
626
* Transclude, compile and link element.
727
*
@@ -136,14 +156,8 @@ exports._destroy = function (remove, deferCleanup) {
136156
var parent = this.$parent
137157
if (parent && !parent._isBeingDestroyed) {
138158
parent.$children.$remove(this)
139-
// unregister ref
140-
var ref = this.$options._ref
141-
if (ref) {
142-
var scope = this._scope || this._context
143-
if (scope.$refs[ref] === this) {
144-
scope.$refs[ref] = null
145-
}
146-
}
159+
// unregister ref (remove: true)
160+
this._updateRef(true)
147161
}
148162
// destroy all children.
149163
i = this.$children.length

‎test/unit/specs/compiler/compile_spec.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ if (_.inBrowser) {
9090
expect(args[0].name).toBe('b')
9191
expect(args[0].expression).toBe('1')
9292
expect(args[0].def).toBe(defB)
93-
expect(args[0].modifiers.literal).toBe(true)
9493
expect(args[1]).toBe(el.firstChild)
9594
// 4 (explicit literal)
9695
args = vm._bindDir.calls.argsFor(3)
@@ -245,12 +244,14 @@ if (_.inBrowser) {
245244
testTwoWay: null,
246245
twoWayWarn: null,
247246
testOneTime: null,
248-
optimizeLiteral: null
247+
optimizeLiteral: null,
248+
optimizeLiteralStr: null
249249
}
250250
el.innerHTML = '<div ' +
251251
'v-bind:test-normal="a" ' +
252252
'test-literal="1" ' +
253253
':optimize-literal="1" ' +
254+
':optimize-literal-str="\'true\'"' +
254255
':test-two-way.sync="a" ' +
255256
':two-way-warn.sync="a + 1" ' +
256257
':test-one-time.once="a"></div>'
@@ -261,6 +262,8 @@ if (_.inBrowser) {
261262
expect(vm._data.testLiteral).toBe('1')
262263
expect(vm.optimizeLiteral).toBe(1)
263264
expect(vm._data.optimizeLiteral).toBe(1)
265+
expect(vm.optimizeLiteralStr).toBe('true')
266+
expect(vm._data.optimizeLiteralStr).toBe('true')
264267
// one time
265268
expect(vm.testOneTime).toBe('from parent: a')
266269
expect(vm._data.testOneTime).toBe('from parent: a')

‎test/unit/specs/directives/public/ref_spec.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ if (_.inBrowser) {
5353
})
5454
})
5555

56+
it('with dynamic component + keep-alive', function (done) {
57+
var vm = new Vue({
58+
el: el,
59+
components: components,
60+
data: { test: 'test' },
61+
template: '<component :is="test" v-ref:test keep-alive></component>'
62+
})
63+
expect(vm.$refs.test.$options.id).toBe('test')
64+
vm.test = 'test2'
65+
_.nextTick(function () {
66+
expect(vm.$refs.test.$options.id).toBe('test2')
67+
vm.test = ''
68+
_.nextTick(function () {
69+
expect(vm.$refs.test).toBe(null)
70+
done()
71+
})
72+
})
73+
})
74+
5675
it('should be reactive when bound by dynamic component and hoisted', function (done) {
5776
var vm = new Vue({
5877
el: el,

‎test/unit/specs/instance/init_spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ describe('Instance Init', function () {
66
constructor: {
77
options: { a: 1, b: 2 }
88
},
9+
_updateRef: jasmine.createSpy(),
910
_initEvents: jasmine.createSpy(),
1011
_callHook: jasmine.createSpy(),
1112
_initState: jasmine.createSpy(),
@@ -38,6 +39,7 @@ describe('Instance Init', function () {
3839
it('should call other init methods', function () {
3940
expect(stub._initEvents).toHaveBeenCalled()
4041
expect(stub._initState).toHaveBeenCalled()
42+
expect(stub._updateRef).toHaveBeenCalled()
4143
})
4244

4345
it('should call created hook', function () {

0 commit comments

Comments
 (0)
0