Changed checkbox -value to -exp, simplified matchValue

fergaldoyle · fergaldoyle · commit 722094eefcb9 · 2015-08-11T21:49:29.000+01:00
diff --git a/src/directives/model/checkbox.js b/src/directives/model/checkbox.js
@@ -5,8 +5,8 @@ module.exports = {
   bind: function () {
     var self = this
     var el = this.el
-    var trueExp = this._checkParam('true-value')
-    var falseExp = this._checkParam('false-value')
+    var trueExp = this._checkParam('true-exp')
+    var falseExp = this._checkParam('false-exp')
 
     function getValue () {
       var val = el.checked
@@ -22,21 +22,10 @@ module.exports = {
 
     function matchValue (value) {
       var trueValue = true
-      var falseValue = false
-
       if (trueExp !== null) {
         trueValue = self.vm.$eval(trueExp)
       }
-      if (falseExp !== null) {
-        falseValue = self.vm.$eval(falseExp)
-      }
-      if (trueValue === value) {
-        return true
-      } else if (falseValue === value) {
-        return false
-      } else {
-        return null
-      }
+      return trueValue === value
     }
     this._matchValue = matchValue
 
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -141,15 +141,15 @@ if (_.inBrowser) {
       expect(vm.test).toBe(true)
     })
 
-    it('checkbox true-value false-value', function (done) {
+    it('checkbox expression', function (done) {
       var vm = new Vue({
         el: el,
         data: {
           test: '',
           expression1: 'aTrueValue',
           expression2: 'aFalseValue'
         },
-        template: '<input type="checkbox" v-model="test" true-value="expression1" false-value="expression2">'
+        template: '<input type="checkbox" v-model="test" true-exp="expression1" false-exp="expression2">'
       })
       expect(vm.test).toBe('')
       el.firstChild.click()
