diff --git a/src/progressbar/docs/demo.html b/src/progressbar/docs/demo.html index 8fbfb082f8..ca00567d85 100644 --- a/src/progressbar/docs/demo.html +++ b/src/progressbar/docs/demo.html @@ -1,27 +1,27 @@

Static

-
-
-
+
+
+

Dynamic

Value: {{dynamic}}
- + No animation - + Object (changes type based on value) - +

Stacked

Array values with automatic types
Value: {{stackedArray}}
- + Objects
Value: {{stacked}}
- +
\ No newline at end of file diff --git a/src/progressbar/progressbar.js b/src/progressbar/progressbar.js index ced3b88833..2a5eb28d2d 100644 --- a/src/progressbar/progressbar.js +++ b/src/progressbar/progressbar.js @@ -49,7 +49,7 @@ angular.module('ui.bootstrap.progressbar', ['ui.bootstrap.transition']) replace: true, controller: 'ProgressBarController', scope: { - value: '=', + value: '=percent', onFull: '&', onEmpty: '&' }, diff --git a/src/progressbar/test/progressbar.spec.js b/src/progressbar/test/progressbar.spec.js index 24889e26e7..70e20f0f03 100644 --- a/src/progressbar/test/progressbar.spec.js +++ b/src/progressbar/test/progressbar.spec.js @@ -5,7 +5,7 @@ describe('progressbar directive with no binding', function () { beforeEach(inject(function(_$compile_, _$rootScope_) { $compile = _$compile_; $rootScope = _$rootScope_; - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); })); @@ -31,7 +31,7 @@ describe('progressbar directive with data-binding', function () { $compile = _$compile_; $rootScope = _$rootScope_; $rootScope.percent = 33; - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); })); @@ -90,7 +90,7 @@ describe('stacked progressbar directive', function () { $compile = _$compile_; $rootScope = _$rootScope_; $rootScope.stacked = [12, 22, 33]; - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); })); @@ -205,7 +205,7 @@ describe('stacked progressbar directive handlers', function () { $rootScope.stacked = [20, 30, 40]; // total: 90 $rootScope.fullHandler = jasmine.createSpy('fullHandler'); $rootScope.emptyHandler = jasmine.createSpy('emptyHandler'); - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); })); @@ -242,7 +242,7 @@ describe('stacked progressbar directive with auto-types', function () { $compile = _$compile_; $rootScope = _$rootScope_; $rootScope.stacked = [12, 22, {value: 33}, {value: 5}, 11]; - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); angular.extend(config, progressConfig); @@ -311,7 +311,7 @@ describe('stacked progressbar directive with auto-types', function () { }); it('can bypass default configuration for stacked classes from attribute', function() { - element = $compile('')($rootScope); + element = $compile('')($rootScope); $rootScope.$digest(); var stackedTypes = config.stackedTypes;