Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 58efec8

Browse files
bekospkozlowski-opensource
authored andcommitted
fix(progressbar): user percent attribute instead of value.
Closes #535. Problem with IE10. BREAKING CHANGE: The 'value' is replaced by 'percent'. Before: <progress value="..."></progress> After: <progress percent="..."></progress>
1 parent 25f6e55 commit 58efec8

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/progressbar/docs/demo.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<div ng-controller="ProgressDemoCtrl" class="well">
22
<h2>Static</h2>
33
<div class="row-fluid">
4-
<div class="span4"><progress value="55"></progress></div>
5-
<div class="span4"><progress value="22" class="progress-warning progress-striped"></progress></div>
6-
<div class="span4"><progress value="88" class="progress-danger progress-striped active"></div>
4+
<div class="span4"><progress percent="55"></progress></div>
5+
<div class="span4"><progress percent="22" class="progress-warning progress-striped"></progress></div>
6+
<div class="span4"><progress percent="88" class="progress-danger progress-striped active"></div>
77
</div>
88

99
<h2>Dynamic <button class="btn btn-primary" type="button" ng-click="random()">Randomize</button></h2>
1010
<pre>Value: {{dynamic}}</pre>
11-
<progress value="dynamic"></progress>
11+
<progress percent="dynamic"></progress>
1212

1313
<small><em>No animation</em></small>
14-
<progress value="dynamic" class="progress-success" animate="false"></progress>
14+
<progress percent="dynamic" class="progress-success" animate="false"></progress>
1515

1616
<small><em>Object (changes type based on value)</em></small>
17-
<progress value="dynamicObject" class="progress-striped active"></progress>
17+
<progress percent="dynamicObject" class="progress-striped active"></progress>
1818

1919
<h2>Stacked <button class="btn btn-primary" type="button" ng-click="randomStacked()">Randomize</button></h2>
2020
<small><em>Array values with automatic types</em></small>
2121
<pre>Value: {{stackedArray}}</pre>
22-
<progress value="stackedArray" auto-type="true"></progress>
22+
<progress percent="stackedArray" auto-type="true"></progress>
2323

2424
<small><em>Objects</em></small>
2525
<pre>Value: {{stacked}}</pre>
26-
<progress value="stacked"></progress>
26+
<progress percent="stacked"></progress>
2727
</div>

src/progressbar/progressbar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ angular.module('ui.bootstrap.progressbar', ['ui.bootstrap.transition'])
4949
replace: true,
5050
controller: 'ProgressBarController',
5151
scope: {
52-
value: '=',
52+
value: '=percent',
5353
onFull: '&',
5454
onEmpty: '&'
5555
},

src/progressbar/test/progressbar.spec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ describe('progressbar directive with no binding', function () {
55
beforeEach(inject(function(_$compile_, _$rootScope_) {
66
$compile = _$compile_;
77
$rootScope = _$rootScope_;
8-
element = $compile('<progress value="22" animate="false"></progress>')($rootScope);
8+
element = $compile('<progress percent="22" animate="false"></progress>')($rootScope);
99
$rootScope.$digest();
1010
}));
1111

@@ -31,7 +31,7 @@ describe('progressbar directive with data-binding', function () {
3131
$compile = _$compile_;
3232
$rootScope = _$rootScope_;
3333
$rootScope.percent = 33;
34-
element = $compile('<progress value="percent" animate="false"></progress>')($rootScope);
34+
element = $compile('<progress percent="percent" animate="false"></progress>')($rootScope);
3535
$rootScope.$digest();
3636
}));
3737

@@ -90,7 +90,7 @@ describe('stacked progressbar directive', function () {
9090
$compile = _$compile_;
9191
$rootScope = _$rootScope_;
9292
$rootScope.stacked = [12, 22, 33];
93-
element = $compile('<progress value="stacked" animate="false"></progress>')($rootScope);
93+
element = $compile('<progress percent="stacked" animate="false"></progress>')($rootScope);
9494
$rootScope.$digest();
9595
}));
9696

@@ -205,7 +205,7 @@ describe('stacked progressbar directive handlers', function () {
205205
$rootScope.stacked = [20, 30, 40]; // total: 90
206206
$rootScope.fullHandler = jasmine.createSpy('fullHandler');
207207
$rootScope.emptyHandler = jasmine.createSpy('emptyHandler');
208-
element = $compile('<progress value="stacked" on-full="fullHandler()" on-empty="emptyHandler()" animate="false"></progress>')($rootScope);
208+
element = $compile('<progress percent="stacked" on-full="fullHandler()" on-empty="emptyHandler()" animate="false"></progress>')($rootScope);
209209
$rootScope.$digest();
210210
}));
211211

@@ -242,7 +242,7 @@ describe('stacked progressbar directive with auto-types', function () {
242242
$compile = _$compile_;
243243
$rootScope = _$rootScope_;
244244
$rootScope.stacked = [12, 22, {value: 33}, {value: 5}, 11];
245-
element = $compile('<progress value="stacked" animate="false" auto-type="true"></progress>')($rootScope);
245+
element = $compile('<progress percent="stacked" animate="false" auto-type="true"></progress>')($rootScope);
246246
$rootScope.$digest();
247247

248248
angular.extend(config, progressConfig);
@@ -311,7 +311,7 @@ describe('stacked progressbar directive with auto-types', function () {
311311
});
312312

313313
it('can bypass default configuration for stacked classes from attribute', function() {
314-
element = $compile('<progress value="stacked" stacked-types="\'danger\', \'warning\', \'success\'" auto-type="true" animate="false"></progress>')($rootScope);
314+
element = $compile('<progress percent="stacked" stacked-types="\'danger\', \'warning\', \'success\'" auto-type="true" animate="false"></progress>')($rootScope);
315315
$rootScope.$digest();
316316

317317
var stackedTypes = config.stackedTypes;

0 commit comments

Comments
 (0)