Fix lint errors

fergaldoyle · fergaldoyle · commit b027153d4a97 · 2015-08-11T21:49:29.000+01:00
diff --git a/src/directives/model/checkbox.js b/src/directives/model/checkbox.js
@@ -7,37 +7,39 @@ module.exports = {
     var el = this.el
     var trueExp = this._checkParam('true-value')
     var falseExp = this._checkParam('false-value')
-    
+
     function getValue () {
       var val = el.checked
-      if(val && trueExp !== null) {
-        val = self.vm.$eval(trueExp);
+      if (val && trueExp !== null) {
+        val = self.vm.$eval(trueExp)
       }
-      if(!val && falseExp !== null) {
-        val = self.vm.$eval(falseExp);
+      if (!val && falseExp !== null) {
+        val = self.vm.$eval(falseExp)
       }
       return val
     }
     this._getValue = getValue
-    
+
     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 (trueExp !== null) {
+        trueValue = self.vm.$eval(trueExp)
+      }
+      if (falseExp !== null) {
+        falseValue = self.vm.$eval(falseExp)
       }
-      if(trueValue == value) {
+      if (trueValue === value) {
         return true
-      } else {
+      } else if (falseValue === value) {
         return false
+      } else {
+        return null
       }
     }
     this._matchValue = matchValue
-    
+
     this.listener = function () {
       self.set(getValue())
     }
diff --git a/src/directives/model/radio.js b/src/directives/model/radio.js
@@ -9,14 +9,14 @@ module.exports = {
     var expression = this._checkParam('exp')
     function getValue () {
       var val = el.value
-      if(number) {
+      if (number) {
         val = _.toNumber(val)
       } else if (expression !== null) {
         val = self.vm.$eval(expression)
       }
       return val
     }
-    this._getValue = getValue;
+    this._getValue = getValue
     this.listener = function () {
       self.set(getValue())
     }
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -107,7 +107,7 @@ if (_.inBrowser) {
         done()
       })
     })
-    
+
     it('checkbox', function (done) {
       var vm = new Vue({
         el: el,
@@ -140,7 +140,7 @@ if (_.inBrowser) {
       })
       expect(vm.test).toBe(true)
     })
-    
+
     it('checkbox true-value false-value', function (done) {
       var vm = new Vue({
         el: el,
@@ -163,11 +163,11 @@ if (_.inBrowser) {
         // the updated value of 'test' is not being passed
         // into the 'update' method of v-model in this environment
         // works fine in manual test
-        //expect(el.firstChild.checked).toBe(true)
-        done()        
+        // expect(el.firstChild.checked).toBe(true)
+        done()
       })
-      
-    })    
+
+    })
 
     it('select', function (done) {
       var vm = new Vue({

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ module.exports = {`
`9`	`9`	`var expression = this._checkParam('exp')`
`10`	`10`	`function getValue () {`
`11`	`11`	`var val = el.value`
`12`		`- if(number) {`
	`12`	`+ if (number) {`
`13`	`13`	`val = _.toNumber(val)`
`14`	`14`	`} else if (expression !== null) {`
`15`	`15`	`val = self.vm.$eval(expression)`
`16`	`16`	`}`
`17`	`17`	`return val`
`18`	`18`	`}`
`19`		`- this._getValue = getValue;`
	`19`	`+ this._getValue = getValue`
`20`	`20`	`this.listener = function () {`
`21`	`21`	`self.set(getValue())`
`22`	`22`	`}`