skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(progress-bar): determinate state reflects value (#542)

Browse Source 
Fixes #519
This commit is contained in:
Sendil Kumar N
2016-05-28 02:32:01 +08:00
committed by Jeremy Elbourn
parent b47097d8d2
commit 6b86df0d91
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/progress-bar/progress-bar.html
+2 -2
View File
@@ -1,5 +1,5 @@
<!-- The background div is named as such because it appears below the other divs and is not sized based on values. -->
<div class="md-progress-bar-background"></div>
<div class="md-progress-bar-buffer" [style.transform]="bufferTransform()"></div>
<div class="md-progress-bar-primary md-progress-bar-fill" [style.transform]="primaryTransform()"></div>
<div class="md-progress-bar-buffer" [ngStyle]="bufferTransform()"></div>
<div class="md-progress-bar-primary md-progress-bar-fill" [ngStyle]="primaryTransform()"></div>
<div class="md-progress-bar-secondary md-progress-bar-fill"></div>
src/components/progress-bar/progress-bar.spec.ts
+7 -7
View File
@@ -88,27 +88,27 @@ describe('MdProgressBar', () => {
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
let progressComponent = progressElement.componentInstance;
expect(progressComponent.primaryTransform()).toBe('scaleX(0)');
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0)' });
expect(progressComponent.bufferTransform()).toBe(undefined);
progressComponent.value = 40;
expect(progressComponent.primaryTransform()).toBe('scaleX(0.4)');
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.4)' });
expect(progressComponent.bufferTransform()).toBe(undefined);
progressComponent.value = 35;
progressComponent.bufferValue = 55;
expect(progressComponent.primaryTransform()).toBe('scaleX(0.35)');
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
expect(progressComponent.bufferTransform()).toBe(undefined);
progressComponent.mode = 'buffer';
expect(progressComponent.primaryTransform()).toBe('scaleX(0.35)');
expect(progressComponent.bufferTransform()).toBe('scaleX(0.55)');
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
expect(progressComponent.bufferTransform()).toEqual({ transform: 'scaleX(0.55)' });
progressComponent.value = 60;
progressComponent.bufferValue = 60;
expect(progressComponent.primaryTransform()).toBe('scaleX(0.6)');
expect(progressComponent.bufferTransform()).toBe('scaleX(0.6)');
expect(progressComponent.primaryTransform()).toEqual({ transform: 'scaleX(0.6)' });
expect(progressComponent.bufferTransform()).toEqual({ transform: 'scaleX(0.6)' });
done();
});
});
src/components/progress-bar/progress-bar.ts
+2 -2
View File
@@ -68,7 +68,7 @@ export class MdProgressBar {
*/
primaryTransform() {
let scale = this.value / 100;
return `scaleX(${scale})`;
return {transform: `scaleX(${scale})`};
}
/**
@@ -79,7 +79,7 @@ export class MdProgressBar {
bufferTransform() {
if (this.mode == 'buffer') {
let scale = this.bufferValue / 100;
return `scaleX(${scale})`;
return {transform: `scaleX(${scale})`};
}
}
}