wip

Author: Narretz

src/ng/directive/input.js

@@ -1310,6 +1310,7 @@ function radioInputType(scope, element, attr, ctrl) {
   ctrl.$render = function() {
     var value = attr.value;
     element[0].checked = (value == ctrl.$viewValue);
+    dump('after render');
   };
 
   attr.$observe('value', ctrl.$render);
@@ -1339,6 +1340,7 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
   element.on('click', listener);
 
   ctrl.$render = function() {
+    dump('render', typeof ctrl.$viewValue);
     element[0].checked = ctrl.$viewValue;
   };
 
@@ -1350,6 +1352,7 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt
   };
 
   ctrl.$formatters.push(function(value) {
+    dump('formatter', value, trueValue, equals(value, trueValue));
     return equals(value, trueValue);
   });
 

src/ngAria/aria.js

@@ -228,19 +228,27 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
         if (needsTabIndex) {
           needsTabIndex = false;
           return function ngAriaRadioReaction(newVal) {
-            var boolVal = (angular.isUndefined(newVal) ? newVal : newVal.toString()) === attr.value;
+            // var boolVal = (angular.isUndefined(newVal) ? newVal : newVal.toString()) === attr.value;
+            // var boolVal = !ngModel.$isEmpty(ngModel.$viewValue);
+            var boolVal = (attr.value == ngModel.$viewValue);
+            dump(ngModel.$viewValue, ngModel.$isEmpty(ngModel.$viewValue));
             elem.attr('aria-checked', boolVal);
             elem.attr('tabindex', 0 - !boolVal);
           };
         } else {
           return function ngAriaRadioReaction(newVal) {
-            elem.attr('aria-checked', (angular.isUndefined(newVal) ? newVal : newVal.toString()) === attr.value);
+            // elem.attr('aria-checked', (!ngModel.$isEmpty(ngModel.$viewValue)));
+            dump('no needs tabindex', ngModel.$viewValue, ngModel.$isEmpty(ngModel.$viewValue));
+            // elem.attr('aria-checked', (angular.isUndefined(newVal) ? newVal : newVal.toString()) === attr.value);
+            elem.attr('aria-checked', (attr.value == ngModel.$viewValue));
           };
         }
       }
 
       function ngAriaCheckboxReaction(newVal) {
-        elem.attr('aria-checked', !!newVal);
+        // elem.attr('aria-checked', !!newVal);
+        dump('checkbox', newVal, ngModel.$viewValue, ngModel.$isEmpty(ngModel.$viewValue));
+        elem.attr('aria-checked', !ngModel.$isEmpty(ngModel.$viewValue));
       }
 
       switch (shape) {

test/ngAria/ariaSpec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-describe('$aria', function() {
+ddescribe('$aria', function() {
   var scope, $compile, element;
 
   beforeEach(module('ngAria'));
@@ -98,6 +98,18 @@ describe('$aria', function() {
       expect(element.eq(1).attr('aria-checked')).toBe('true');
     });
 
+    it('should handle non-string model values for checkbox', function() {
+      var element = $compile('<input type="checkbox" ng-model="val" ng-true-value="0">')(scope);
+
+      scope.$apply("val=0");
+      expect(element.eq(0).attr('aria-checked')).toBe('true');
+
+      // scope.$apply("val=1");
+      // // dump('bla', element.controller('ngModel').$viewValue);
+      // expect(element.eq(0).attr('aria-checked')).toBe('false');
+      // expect(element.eq(1).attr('aria-checked')).toBe('true');
+    });
+
     it('should handle non-string model values', function() {
       var element = $compile('<input type="radio" ng-model="val" value="0">' +
           '<input type="radio" ng-model="val" value="1">')(scope);
@@ -107,6 +119,7 @@ describe('$aria', function() {
       expect(element.eq(1).attr('aria-checked')).toBe('false');
 
       scope.$apply("val=1");
+      dump('bla', element.controller('ngModel').$viewValue);
       expect(element.eq(0).attr('aria-checked')).toBe('false');
       expect(element.eq(1).attr('aria-checked')).toBe('true');
     });