Mercurial > hg > ugly-duckling
diff src/app/analysis-item/analysis-item.component.html @ 256:6d128e43f4d5
Merge remote-tracking branch 'lucas/feature/determinate-spinner'
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Fri, 28 Apr 2017 09:23:57 +0100 |
parents | 53ea6406d601 |
children | 2d7da410ba46 |
line wrap: on
line diff
--- a/src/app/analysis-item/analysis-item.component.html Thu Apr 27 16:41:04 2017 +0100 +++ b/src/app/analysis-item/analysis-item.component.html Fri Apr 28 09:23:57 2017 +0100 @@ -1,16 +1,24 @@ <md-card> <md-card-header> - <md-card-title>{{title}}</md-card-title> - <md-card-subtitle>{{description}}</md-card-subtitle> + <md-card-title>{{item.title}}</md-card-title> + <md-card-subtitle>{{item.description}}</md-card-subtitle> </md-card-header> <md-card-content> - <app-waveform - [timeline]="timeline" - [trackIdPrefix]=" id || title" - [isSubscribedToAudioService]="isActive && isRoot" - [isSubscribedToExtractionService]="isActive && !isRoot" - [isOneShotExtractor]="true" - [isSeeking]="isActive" - ></app-waveform> + <ng-template [ngIf]="isLoading()"> + <ugly-progress-bar + [isDeterminate]="true" + [progress]="item.progress" + ></ugly-progress-bar> + </ng-template> + <ng-template [ngIf]="!isLoading()"> + <ugly-waveform + [timeline]="timeline" + [trackIdPrefix]=" item.id || item.title" + [isSubscribedToAudioService]="isActive && item.isRoot" + [isSubscribedToExtractionService]="isActive && !item.isRoot" + [isOneShotExtractor]="true" + [isSeeking]="isActive" + ></ugly-waveform> + </ng-template> </md-card-content> </md-card>