diff --git a/src/demo-app/progress-bar/progress-bar-demo.html b/src/demo-app/progress-bar/progress-bar-demo.html index 3e669913063..7c1e558e8c3 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.html +++ b/src/demo-app/progress-bar/progress-bar-demo.html @@ -1,37 +1,45 @@ + + Primary Color + Accent Color + Warn Color + +

Determinate

-
- + +
+ Value: {{determinateProgressValue}} + +
-Value: {{determinateProgressValue}} - - + +
+ + +
+

Buffer

-
- + +
+ Value: {{bufferProgressValue}} + + + + Buffer Value: {{bufferBufferValue}} + + +
+ +
+
-Value: {{bufferProgressValue}} - - - -Buffer Value: {{bufferBufferValue}} - -

Indeterminate

- +

Query

- +
diff --git a/src/demo-app/progress-bar/progress-bar-demo.scss b/src/demo-app/progress-bar/progress-bar-demo.scss index b6de28f90cb..8f038cad031 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.scss +++ b/src/demo-app/progress-bar/progress-bar-demo.scss @@ -1,12 +1,16 @@ .demo-progress-bar-container { width: 100%; -} -.demo-progress-bar-margins { - margin: 20px 0; + md-progress-bar { + margin: 20px 0; + } } .demo-progress-bar-spacer { display: inline-block; width: 50px; +} + +.demo-progress-bar-controls { + margin: 10px 0; } \ No newline at end of file diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts index 5e150165130..a3eb4f1ca71 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.ts +++ b/src/demo-app/progress-bar/progress-bar-demo.ts @@ -10,19 +10,24 @@ import {Component} from '@angular/core'; styleUrls: ['progress-bar-demo.css'], }) export class ProgressBarDemo { + color: string = 'primary'; determinateProgressValue: number = 30; bufferProgressValue: number = 30; bufferBufferValue: number = 40; stepDeterminateProgressVal(val: number) { - this.determinateProgressValue += val; + this.determinateProgressValue = this.clampValue(val + this.determinateProgressValue); } stepBufferProgressVal(val: number) { - this.bufferProgressValue += val; + this.bufferProgressValue = this.clampValue(val + this.bufferProgressValue); } stepBufferBufferVal(val: number) { - this.bufferBufferValue += val; + this.bufferBufferValue = this.clampValue(val + this.bufferBufferValue); + } + + private clampValue(value: number) { + return Math.max(0, Math.min(100, value)); } } diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.html b/src/demo-app/progress-spinner/progress-spinner-demo.html index 64431bf2398..3abea5c81d1 100644 --- a/src/demo-app/progress-spinner/progress-spinner-demo.html +++ b/src/demo-app/progress-spinner/progress-spinner-demo.html @@ -1,21 +1,26 @@

Determinate

-
- - + +
+

Value: {{progressValue}}

+ +
-Value: {{progressValue}} - - - +
+ + +

Indeterminate

+ + + Primary Color + Accent Color + Warn Color + +
- - - + + +
diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.scss b/src/demo-app/progress-spinner/progress-spinner-demo.scss index 92525a01e5c..8bb5ac7b346 100644 --- a/src/demo-app/progress-spinner/progress-spinner-demo.scss +++ b/src/demo-app/progress-spinner/progress-spinner-demo.scss @@ -7,3 +7,7 @@ } } + +.demo-progress-spinner-controls { + margin: 10px 0; +} \ No newline at end of file diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.ts b/src/demo-app/progress-spinner/progress-spinner-demo.ts index 03f68a3206f..c11cedc5f57 100644 --- a/src/demo-app/progress-spinner/progress-spinner-demo.ts +++ b/src/demo-app/progress-spinner/progress-spinner-demo.ts @@ -9,9 +9,10 @@ import {Component} from '@angular/core'; }) export class ProgressSpinnerDemo { progressValue: number = 40; + color: string = 'primary'; step(val: number) { - this.progressValue += val; + this.progressValue = Math.max(0, Math.min(100, val + this.progressValue)); } }