|
|
@ -1,5 +1,5 @@ |
|
|
|
/*! |
|
|
|
* Vue.js v2.5.5 |
|
|
|
* Vue.js v2.5.6 |
|
|
|
* (c) 2014-2017 Evan You |
|
|
|
* Released under the MIT License. |
|
|
|
*/ |
|
|
@ -4968,7 +4968,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', { |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
Vue$3.version = '2.5.5'; |
|
|
|
Vue$3.version = '2.5.6'; |
|
|
|
|
|
|
|
/* */ |
|
|
|
|
|
|
@ -6675,7 +6675,6 @@ function model ( |
|
|
|
var modifiers = dir.modifiers; |
|
|
|
var tag = el.tag; |
|
|
|
var type = el.attrsMap.type; |
|
|
|
var attrsMap = el.attrsMap; |
|
|
|
|
|
|
|
if (process.env.NODE_ENV !== 'production') { |
|
|
|
// inputs with type="file" are read only and setting the input's
|
|
|
@ -6686,20 +6685,6 @@ function model ( |
|
|
|
"File inputs are read only. Use a v-on:change listener instead." |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
// warn if v-bind:value conflicts with v-model
|
|
|
|
if ( |
|
|
|
(attrsMap['v-bind:value'] || attrsMap[':value']) && |
|
|
|
type !== 'checkbox' && |
|
|
|
type !== 'radio' && |
|
|
|
tag !== 'select' |
|
|
|
) { |
|
|
|
var vBindValue = attrsMap['v-bind:value'] ? 'v-bind:value' : ':value'; |
|
|
|
warn$1( |
|
|
|
vBindValue + " conflicts with v-model on the same element " + |
|
|
|
'because the latter already expands to a value binding internally' |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (el.component) { |
|
|
@ -6797,6 +6782,19 @@ function genDefaultModel ( |
|
|
|
modifiers |
|
|
|
) { |
|
|
|
var type = el.attrsMap.type; |
|
|
|
|
|
|
|
// warn if v-bind:value conflicts with v-model
|
|
|
|
if (process.env.NODE_ENV !== 'production') { |
|
|
|
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value']; |
|
|
|
if (value$1) { |
|
|
|
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value'; |
|
|
|
warn$1( |
|
|
|
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " + |
|
|
|
'because the latter already expands to a value binding internally' |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var ref = modifiers || {}; |
|
|
|
var lazy = ref.lazy; |
|
|
|
var number = ref.number; |
|
|
|