test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-03 20:47:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

don`t cast empty string to Boolean if prop types include String and Boolean (fix #4538) (#4539)

Browse Source
This commit is contained in:
Artur Kornakov 2016-12-22 04:41:52 +07:00 committed by Evan You
parent 56bfa1d291
commit 451ea37c7b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/util/props.js
View File

@ -21,10 +21,10 @@ export function validateProp (
const absent = !hasOwn(propsData, key)
let value = propsData[key]
// handle boolean props
if (isBooleanType(prop.type)) {
if (isType(Boolean, prop.type)) {
if (absent && !hasOwn(prop, 'default')) {
value = false
} else if (value === '' || value === hyphenate(key)) {
} else if (!isType(String, prop.type) && (value === '' || value === hyphenate(key))) {
value = true
}
}
@ -168,12 +168,12 @@ function getType (fn) {
return match && match[1]
}
function isBooleanType (fn) {
function isType (type, fn) {
if (!Array.isArray(fn)) {
return getType(fn) === 'Boolean'
return getType(fn) === getType(type)
}
for (let i = 0, len = fn.length; i < len; i++) {
if (getType(fn[i]) === 'Boolean') {
if (getType(fn[i]) === getType(type)) {
return true
}
}