Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/directives/model/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ function buildOptions (parent, options) {
} else {
el.text = op.text
el.value = op.value
if (op.disabled) {
el.disabled = true
}
}
} else {
el = document.createElement('optgroup')
Expand Down
6 changes: 5 additions & 1 deletion test/unit/specs/directives/model_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,19 +245,23 @@ if (_.inBrowser) {
data: {
test: 'b',
opts: [
{ text: 'Select an option', value: null, disabled: true },
{ text: 'A', value: 'a' },
{ text: 'B', value: 'b' }
]
},
template: '<select v-model="test" options="opts"></select>'
})
expect(el.firstChild.innerHTML).toBe(
'<option disabled="">Select an option</option>' +
'<option value="a">A</option>' +
'<option value="b">B</option>'
)
var opts = el.firstChild.options
expect(opts[0].disabled).toBe(true)
expect(opts[0].selected).toBe(false)
expect(opts[1].selected).toBe(true)
expect(opts[1].selected).toBe(false)
expect(opts[2].selected).toBe(true)
})

it('select + options + optgroup', function () {
Expand Down