Skip to content

Commit 6b86df0

Browse files
sendilkumarnjelbourn
authored andcommitted
fix(progress-bar): determinate state reflects value (#542)
Fixes #519
1 parent b47097d commit 6b86df0

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- The background div is named as such because it appears below the other divs and is not sized based on values. -->
22
<div class="md-progress-bar-background"></div>
3-
<div class="md-progress-bar-buffer" [style.transform]="bufferTransform()"></div>
4-
<div class="md-progress-bar-primary md-progress-bar-fill" [style.transform]="primaryTransform()"></div>
3+
<div class="md-progress-bar-buffer" [ngStyle]="bufferTransform()"></div>
4+
<div class="md-progress-bar-primary md-progress-bar-fill" [ngStyle]="primaryTransform()"></div>
55
<div class="md-progress-bar-secondary md-progress-bar-fill"></div>

src/components/progress-bar/progress-bar.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,27 @@ describe('MdProgressBar', () => {
8888
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
8989
let progressComponent = progressElement.componentInstance;
9090

91-
expect(progressComponent.primaryTransform()).toBe('scaleX(0)');
91+
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0)' });
9292
expect(progressComponent.bufferTransform()).toBe(undefined);
9393

9494
progressComponent.value = 40;
95-
expect(progressComponent.primaryTransform()).toBe('scaleX(0.4)');
95+
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.4)' });
9696
expect(progressComponent.bufferTransform()).toBe(undefined);
9797

9898
progressComponent.value = 35;
9999
progressComponent.bufferValue = 55;
100-
expect(progressComponent.primaryTransform()).toBe('scaleX(0.35)');
100+
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
101101
expect(progressComponent.bufferTransform()).toBe(undefined);
102102

103103
progressComponent.mode = 'buffer';
104-
expect(progressComponent.primaryTransform()).toBe('scaleX(0.35)');
105-
expect(progressComponent.bufferTransform()).toBe('scaleX(0.55)');
104+
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
105+
expect(progressComponent.bufferTransform()).toEqual({ transform: 'scaleX(0.55)' });
106106

107107

108108
progressComponent.value = 60;
109109
progressComponent.bufferValue = 60;
110-
expect(progressComponent.primaryTransform()).toBe('scaleX(0.6)');
111-
expect(progressComponent.bufferTransform()).toBe('scaleX(0.6)');
110+
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.6)' });
111+
expect(progressComponent.bufferTransform()).toEqual({ transform: 'scaleX(0.6)' });
112112
done();
113113
});
114114
});

src/components/progress-bar/progress-bar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class MdProgressBar {
6868
*/
6969
primaryTransform() {
7070
let scale = this.value / 100;
71-
return `scaleX(${scale})`;
71+
return {transform: `scaleX(${scale})`};
7272
}
7373

7474
/**
@@ -79,7 +79,7 @@ export class MdProgressBar {
7979
bufferTransform() {
8080
if (this.mode == 'buffer') {
8181
let scale = this.bufferValue / 100;
82-
return `scaleX(${scale})`;
82+
return {transform: `scaleX(${scale})`};
8383
}
8484
}
8585
}

0 commit comments

Comments
 (0)