diff --git a/sharedComponents/slider-utils/slider-column.component.ts b/sharedComponents/slider-utils/slider-column.component.ts index d3bb22a4..8929bb25 100644 --- a/sharedComponents/slider-utils/slider-column.component.ts +++ b/sharedComponents/slider-utils/slider-column.component.ts @@ -17,7 +17,7 @@ export class SliderColumnComponent implements AfterContentInit, OnDestroy { @Input() type: 'slider' | 'nav' = null; @Input() - animation = 'uk-animation-fade'; + animation = null; @ContentChildren(SliderItemComponent) items: QueryList; @ContentChildren(SliderNavItemComponent) navItems: QueryList; public isMobile: boolean; @@ -35,12 +35,14 @@ export class SliderColumnComponent implements AfterContentInit, OnDestroy { } ngAfterContentInit() { - this.slides.forEach(slide => { - slide.init(this.animation); - }); - this.navItems.forEach(slide => { - slide.init(this.animation); - }); + if (this.animation) { + this.slides.forEach(slide => { + slide.init(this.animation); + }); + this.navItems.forEach(slide => { + slide.init(this.animation); + }); + } this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => { this.isMobile = isMobile; })); @@ -56,9 +58,7 @@ export class SliderColumnComponent implements AfterContentInit, OnDestroy { if (this.type === 'nav') { let slides = this.navItems; for (let i = 0; i < slides.length; i++) { - if (this.isMobile) { - slides.get(i).setActive(slides.get(i).start <= time && (!slides.get(i + 1) || slides.get(i + 1).start > time)); - } + slides.get(i).setActive(!this.isMobile || (slides.get(i).start <= time && (!slides.get(i + 1) || slides.get(i + 1).start > time))); slides.get(i).active = slides.get(i).start <= time && (!slides.get(i + 1) || slides.get(i + 1).start > time); } } diff --git a/sharedComponents/slider-utils/slider-container.component.ts b/sharedComponents/slider-utils/slider-container.component.ts index 4731405c..1fd18467 100644 --- a/sharedComponents/slider-utils/slider-container.component.ts +++ b/sharedComponents/slider-utils/slider-container.component.ts @@ -18,7 +18,7 @@ export class Stage { @Component({ selector: 'slider-container', template: ` -
+