fix merge conflicts for #1610

This commit is contained in:
Leo 2017-02-23 18:41:46 -05:00
commit e019c8131c
6 changed files with 155 additions and 57 deletions

View file

@ -468,6 +468,11 @@ module.exports = function($window) {
if (vnode.tag === "select" && key === "value" && vnode.dom.value == value && vnode.dom === $doc.activeElement) return
//setting option[value] to same value while having select open blinks select dropdown in Chrome
if (vnode.tag === "option" && key === "value" && vnode.dom.value == value) return
// If you assign an input type that is not supported by IE 11 with an assignment expression, an error will occur.
if (vnode.tag === "input" && key === "type") {
element.setAttribute(key, value)
return
}
element[key] = value
}
else {