Allow exp attribute for radio input. Values saved to v-model will be the result of evaluated expression

fergaldoyle · fergaldoyle · commit a9367d1e9206 · 2015-08-11T21:49:29.000+01:00
diff --git a/src/directives/model/radio.js b/src/directives/model/radio.js
@@ -6,11 +6,17 @@ module.exports = {
     var self = this
     var el = this.el
     var number = this._checkParam('number') != null
+    var expression = this._checkParam('exp')
     function getValue () {
-      return number
-        ? _.toNumber(el.value)
-        : el.value
+      var val = el.value
+      if(number) {
+        val = _.toNumber(val)
+      } else if (expression !== null) {
+        val = self.vm.$eval(expression)
+      }
+      return val
     }
+    this._getValue = getValue;
     this.listener = function () {
       self.set(getValue())
     }
@@ -22,7 +28,7 @@ module.exports = {
 
   update: function (value) {
     /* eslint-disable eqeqeq */
-    this.el.checked = value == this.el.value
+    this.el.checked = value == this._getValue()
     /* eslint-enable eqeqeq */
   },
 
diff --git a/test/unit/specs/directives/model_spec.js b/test/unit/specs/directives/model_spec.js
@@ -80,6 +80,34 @@ if (_.inBrowser) {
       expect(vm.test).toBe('a')
     })
 
+    fit('radio expression', function (done) {
+      var vm = new Vue({
+        el: el,
+        data: {
+          test: false,
+          test2: 'string1',
+          expression1: 'string1',
+          expression2: 'string2'
+        },
+        template:
+          '<input type="radio" value="1" v-model="test" name="test" exp="true">' +
+          '<input type="radio" value="0" v-model="test" name="test" exp="false">' +
+          '<input type="radio" value="1" v-model="test2" name="test2" exp="expression1">' +
+          '<input type="radio" value="0" v-model="test2" name="test2" exp="expression2">'
+      })
+      expect(el.childNodes[0].checked).toBe(false)
+      expect(el.childNodes[1].checked).toBe(true)
+      expect(el.childNodes[2].checked).toBe(true)
+      expect(el.childNodes[3].checked).toBe(false)
+      _.nextTick(function () {
+        el.childNodes[0].click()
+        expect(vm.test).toBe(true)
+        el.childNodes[3].click()
+        expect(vm.test2).toBe('string2')
+        done()
+      })
+    })
+    
     it('checkbox', function (done) {
       var vm = new Vue({
         el: el,
