From 8005d999a3a891cfec568b360ea93409e012524e Mon Sep 17 00:00:00 2001 From: fsdavid <daviti1@mail.com> Date: Tue, 29 Jun 2021 00:11:16 +0200 Subject: [PATCH] Quick tour review fixes --- src/ui/quickTour/quickTour.service.ts | 14 +++++++++++--- src/ui/quickTour/quickTourThis.directive.ts | 5 +---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ui/quickTour/quickTour.service.ts b/src/ui/quickTour/quickTour.service.ts index 78bd0c164..afff39627 100644 --- a/src/ui/quickTour/quickTour.service.ts +++ b/src/ui/quickTour/quickTour.service.ts @@ -5,6 +5,7 @@ import { ComponentPortal } from "@angular/cdk/portal"; import { QuickTourThis } from "./quickTourThis.directive"; import { DoublyLinkedList, IDoublyLinkedItem } from 'src/util' import { QUICK_TOUR_CMP_INJTKN } from "./constrants"; +import {LOCAL_STORAGE_CONST} from "src/util/constants"; export function findInLinkedList<T extends object>(first: IDoublyLinkedItem<T>, predicate: (linkedObj: IDoublyLinkedItem<T>) => boolean): IDoublyLinkedItem<T>{ let compareObj = first, @@ -62,6 +63,13 @@ export class QuickTourService { this.slides.remove(dir) } + public autoStart() { + if (!localStorage.getItem(LOCAL_STORAGE_CONST.QUICK_TOUR_VIEWED)) { + this.startTour() + localStorage.setItem(LOCAL_STORAGE_CONST.QUICK_TOUR_VIEWED, 'true') + } + } + public startTour() { if (!this.overlayRef) { this.overlayRef = this.overlay.create({ @@ -70,14 +78,14 @@ export class QuickTourService { hasBackdrop: true, backdropClass: ['pe-none', 'cdk-overlay-dark-backdrop'], positionStrategy: this.overlay.position().global(), - }) + }) } - + if (!this.cmpRef) { this.cmpRef = this.overlayRef.attach( new ComponentPortal(this.quickTourCmp) ) - + this.currActiveSlide = this.slides.first this.currentTip$.next(this.currActiveSlide) } diff --git a/src/ui/quickTour/quickTourThis.directive.ts b/src/ui/quickTour/quickTourThis.directive.ts index b7ccf2c7b..d90ab8849 100644 --- a/src/ui/quickTour/quickTourThis.directive.ts +++ b/src/ui/quickTour/quickTourThis.directive.ts @@ -33,10 +33,7 @@ export class QuickTourThis implements OnInit, OnChanges, OnDestroy { this.quickTourService.register(this) if (this.quickTourCheckAutoStart) { - if (!localStorage.getItem(LOCAL_STORAGE_CONST.QUICK_TOUR_VIEWED)) { - this.quickTourService.startTour() - localStorage.setItem(LOCAL_STORAGE_CONST.QUICK_TOUR_VIEWED, 'true') - } + this.quickTourService.autoStart() } } -- GitLab