Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 722094e

Browse filesBrowse files
committed
Changed checkbox -value to -exp, simplified matchValue
1 parent b027153 commit 722094e
Copy full SHA for 722094e

File tree

2 files changed

+5
-16
lines changed
Filter options

2 files changed

+5
-16
lines changed

‎src/directives/model/checkbox.js

Copy file name to clipboardExpand all lines: src/directives/model/checkbox.js
+3-14Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
bind: function () {
66
var self = this
77
var el = this.el
8-
var trueExp = this._checkParam('true-value')
9-
var falseExp = this._checkParam('false-value')
8+
var trueExp = this._checkParam('true-exp')
9+
var falseExp = this._checkParam('false-exp')
1010

1111
function getValue () {
1212
var val = el.checked
@@ -22,21 +22,10 @@ module.exports = {
2222

2323
function matchValue (value) {
2424
var trueValue = true
25-
var falseValue = false
26-
2725
if (trueExp !== null) {
2826
trueValue = self.vm.$eval(trueExp)
2927
}
30-
if (falseExp !== null) {
31-
falseValue = self.vm.$eval(falseExp)
32-
}
33-
if (trueValue === value) {
34-
return true
35-
} else if (falseValue === value) {
36-
return false
37-
} else {
38-
return null
39-
}
28+
return trueValue === value
4029
}
4130
this._matchValue = matchValue
4231

‎test/unit/specs/directives/model_spec.js

Copy file name to clipboardExpand all lines: test/unit/specs/directives/model_spec.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ if (_.inBrowser) {
141141
expect(vm.test).toBe(true)
142142
})
143143

144-
it('checkbox true-value false-value', function (done) {
144+
it('checkbox expression', function (done) {
145145
var vm = new Vue({
146146
el: el,
147147
data: {
148148
test: '',
149149
expression1: 'aTrueValue',
150150
expression2: 'aFalseValue'
151151
},
152-
template: '<input type="checkbox" v-model="test" true-value="expression1" false-value="expression2">'
152+
template: '<input type="checkbox" v-model="test" true-exp="expression1" false-exp="expression2">'
153153
})
154154
expect(vm.test).toBe('')
155155
el.firstChild.click()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.