comparison src/app/notebook-feed/notebook-feed.component.ts @ 460:ccce2c09502e

Manually cherry-pick various refactoring efforts from feature/basic-session-loading
author Lucas Thompson <dev@lucas.im>
date Fri, 30 Jun 2017 10:41:30 +0100
parents 7bb0bac6f8dc
children 50f61d1945db
comparison
equal deleted inserted replaced
459:8d561b6df2fa 460:ccce2c09502e
10 OnDestroy, Output 10 OnDestroy, Output
11 } from '@angular/core'; 11 } from '@angular/core';
12 import Waves from 'waves-ui-piper'; 12 import Waves from 'waves-ui-piper';
13 import { 13 import {
14 getRootUri, 14 getRootUri,
15 isRootAudioItem, 15 isLoadedRootAudioItem,
16 Item 16 Item
17 } from '../analysis-item/analysis-item.component'; 17 } from '../analysis-item/AnalysisItem';
18 import {Observable} from 'rxjs/Observable'; 18 import {Observable} from 'rxjs/Observable';
19 import {Dimension} from '../app.module'; 19 import {Dimension} from '../app.module';
20 import {Subscription} from 'rxjs/Subscription'; 20 import {Subscription} from 'rxjs/Subscription';
21 import {OnSeekHandler} from '../playhead/PlayHeadHelpers'; 21 import {OnSeekHandler} from '../playhead/PlayHeadHelpers';
22 22
80 return timeline; 80 return timeline;
81 } 81 }
82 } 82 }
83 83
84 isAudioItem(item: Item): boolean { 84 isAudioItem(item: Item): boolean {
85 return isRootAudioItem(item); 85 return isLoadedRootAudioItem(item);
86 } 86 }
87 87
88 isActiveItem(item: Item): boolean { 88 isActiveItem(item: Item): boolean {
89 return this.rootAudioUri === getRootUri(item); 89 return this.rootAudioUri === getRootUri(item);
90 } 90 }