fix(buttons): fix uibUncheckable using disable attrib for uibBtnRadio

angular-ui · May 8, 2017 · fca5338 · fca5338
1 parent a2dee1b
commit fca5338
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/buttons/buttons.js b/src/buttons/buttons.js
@@ -44,7 +44,7 @@ angular.module('ui.bootstrap.buttons', [])
 
       if (attrs.uibUncheckable) {
         scope.$watch(uncheckableExpr, function(uncheckable) {
-          attrs.$set('uncheckable', uncheckable ? '' : undefined);
+          attrs.$set('disabled', uncheckable ? 'disabled' : undefined);
         });
       }
     }

diff --git a/src/buttons/docs/demo.html b/src/buttons/docs/demo.html
@@ -20,13 +20,16 @@ <h4>Radio &amp; Uncheckable Radio</h4>
         <label class="btn btn-primary" ng-model="radioModel" uib-btn-radio="'Right'">Right</label>
     </div>
     <div class="btn-group">
-        <label class="btn btn-success" ng-model="radioModel" uib-btn-radio="'Left'" uncheckable>Left</label>
-        <label class="btn btn-success" ng-model="radioModel" uib-btn-radio="'Middle'" uncheckable>Middle</label>
+        <label class="btn btn-success" ng-model="radioModel" uib-btn-radio="'Left'" uib-uncheckable="uncheckable">Left</label>
+        <label class="btn btn-success" ng-model="radioModel" uib-btn-radio="'Middle'">Middle</label>
         <label class="btn btn-success" ng-model="radioModel" uib-btn-radio="'Right'" uib-uncheckable="uncheckable">Right</label>
     </div>
+    <br/>
     <div>
         <button class="btn btn-default" ng-click="uncheckable = !uncheckable">
             Toggle uncheckable
         </button>
+        &nbsp;
+        uncheckable: {{uncheckable}}
     </div>
 </div>
diff --git a/src/buttons/test/buttons.spec.js b/src/buttons/test/buttons.spec.js
@@ -324,11 +324,11 @@ describe('buttons', function() {
     });
 
     describe('uibUncheckable', function() {
-      it('should set uncheckable', function() {
+      it('should set disabled', function() {
         $scope.uncheckable = false;
         var btns = compileButtons('<button ng-model="model" uib-btn-radio="1">click1</button><button ng-model="model" uib-btn-radio="2" uib-uncheckable="uncheckable">click2</button>', $scope);
-        expect(btns.eq(0).attr('uncheckable')).toBeUndefined();
-        expect(btns.eq(1).attr('uncheckable')).toBeUndefined();
+        expect(btns.eq(0).attr('disabled')).toBeUndefined();
+        expect(btns.eq(1).attr('disabled')).toBeUndefined();
 
         expect($scope.model).toBeUndefined();
 
@@ -346,8 +346,8 @@ describe('buttons', function() {
 
         $scope.uncheckable = true;
         $scope.$digest();
-        expect(btns.eq(0).attr('uncheckable')).toBeUndefined();
-        expect(btns.eq(1).attr('uncheckable')).toBeDefined();
+        expect(btns.eq(0).attr('disabled')).toBeUndefined();
+        expect(btns.eq(1).attr('disabled')).toBeDefined();
 
         btns.eq(0).click();
         expect($scope.model).toEqual(1);