This repository was archived by the owner on May 29, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ angular.module('ui.bootstrap.buttons', [])
44
44
45
45
if ( attrs . uibUncheckable ) {
46
46
scope . $watch ( uncheckableExpr , function ( uncheckable ) {
47
- attrs . $set ( 'uncheckable ' , uncheckable ? '' : undefined ) ;
47
+ attrs . $set ( 'disabled ' , uncheckable ? 'disabled ' : undefined ) ;
48
48
} ) ;
49
49
}
50
50
}
Original file line number Diff line number Diff line change @@ -20,13 +20,16 @@ <h4>Radio & Uncheckable Radio</h4>
20
20
< label class ="btn btn-primary " ng-model ="radioModel " uib-btn-radio ="'Right' "> Right</ label >
21
21
</ div >
22
22
< div class ="btn-group ">
23
- < label class ="btn btn-success " ng-model ="radioModel " uib-btn-radio ="'Left' " uncheckable > Left</ label >
24
- < label class ="btn btn-success " ng-model ="radioModel " uib-btn-radio ="'Middle' " uncheckable > Middle</ label >
23
+ < label class ="btn btn-success " ng-model ="radioModel " uib-btn-radio ="'Left' " uib- uncheckable=" uncheckable " > Left</ label >
24
+ < label class ="btn btn-success " ng-model ="radioModel " uib-btn-radio ="'Middle' "> Middle</ label >
25
25
< label class ="btn btn-success " ng-model ="radioModel " uib-btn-radio ="'Right' " uib-uncheckable ="uncheckable "> Right</ label >
26
26
</ div >
27
+ < br />
27
28
< div >
28
29
< button class ="btn btn-default " ng-click ="uncheckable = !uncheckable ">
29
30
Toggle uncheckable
30
31
</ button >
32
+
33
+ uncheckable: {{uncheckable}}
31
34
</ div >
32
35
</ div >
Original file line number Diff line number Diff line change @@ -324,11 +324,11 @@ describe('buttons', function() {
324
324
} ) ;
325
325
326
326
describe ( 'uibUncheckable' , function ( ) {
327
- it ( 'should set uncheckable ' , function ( ) {
327
+ it ( 'should set disabled ' , function ( ) {
328
328
$scope . uncheckable = false ;
329
329
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 ) ;
330
- expect ( btns . eq ( 0 ) . attr ( 'uncheckable ' ) ) . toBeUndefined ( ) ;
331
- expect ( btns . eq ( 1 ) . attr ( 'uncheckable ' ) ) . toBeUndefined ( ) ;
330
+ expect ( btns . eq ( 0 ) . attr ( 'disabled ' ) ) . toBeUndefined ( ) ;
331
+ expect ( btns . eq ( 1 ) . attr ( 'disabled ' ) ) . toBeUndefined ( ) ;
332
332
333
333
expect ( $scope . model ) . toBeUndefined ( ) ;
334
334
@@ -346,8 +346,8 @@ describe('buttons', function() {
346
346
347
347
$scope . uncheckable = true ;
348
348
$scope . $digest ( ) ;
349
- expect ( btns . eq ( 0 ) . attr ( 'uncheckable ' ) ) . toBeUndefined ( ) ;
350
- expect ( btns . eq ( 1 ) . attr ( 'uncheckable ' ) ) . toBeDefined ( ) ;
349
+ expect ( btns . eq ( 0 ) . attr ( 'disabled ' ) ) . toBeUndefined ( ) ;
350
+ expect ( btns . eq ( 1 ) . attr ( 'disabled ' ) ) . toBeDefined ( ) ;
351
351
352
352
btns . eq ( 0 ) . click ( ) ;
353
353
expect ( $scope . model ) . toEqual ( 1 ) ;
You can’t perform that action at this time.
0 commit comments