From ab189290f561656996a6b39cdc2e4ae7c48b3b19 Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Mon, 25 Apr 2022 03:50:51 +0200
Subject: Popravio bug sa scrollom kada se scrolluje vise puta u kratkom
 periodu.

---
 .../app/_pages/experiment/experiment.component.html    | 18 ------------------
 .../src/app/_pages/experiment/experiment.component.ts  | 11 +++++++----
 2 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'frontend/src/app')

diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 86b40cec..2ffc7d8b 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -1,21 +1,3 @@
-<!--<div #wrapper class="text-offwhite d-flex flex-row">
-    <div class="navmenu d-flex flex-column flex-shrink-0 p-3">
-        
-    </div>
-
-    <div class="position-relative">
-        <div *ngIf="event==0" class="overflow-y-auto">
-            <app-folder></app-folder>
-        </div>
-        <div *ngIf="event==1">
-            <div class="text-offwhite" style="height: 100px;width: 100px;background-color: red;top:50%;left: 50%;position: absolute;">Insert odabir kolona</div>
-        </div>
-        <div *ngIf="event==2">
-            <div class="text-offwhite" style="height: 100px;width: 100px;background-color: blue;top:50%;left: 50%;position: absolute;">Insert treniranje</div>
-        </div>
-    </div>
-</div>-->
-
 <div class="container-fluid p-0 text-offwhite holder" style="height: calc(100vh - 64px);">
     <div class="d-flex flex-colum align-items-center sidenav">
         <mat-stepper orientation="vertical" (selectionChange)="changePage($event)">
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 377866d1..ad0f1df2 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -32,7 +32,7 @@ export class ExperimentComponent implements AfterViewInit {
 
     setInterval(() => {
       this.updatePageIfScrolled();
-    }, 200);
+    }, 100);
 
     this.stepsContainer.nativeElement.addEventListener('scroll', (event: Event) => {
       Shared.emitBGScrollEvent(this.stepsContainer.nativeElement.scrollTop);
@@ -63,7 +63,10 @@ export class ExperimentComponent implements AfterViewInit {
     this.updatePage(pageNum);
   }
 
+  scrollTimeout: any;
+
   updatePage(pageNum: number) {
+    this.scrolling = true;
     this.event = pageNum;
     let scrollAmount = 0;
     this.steps.forEach((step, index) => {
@@ -71,10 +74,10 @@ export class ExperimentComponent implements AfterViewInit {
         scrollAmount = step.nativeElement.offsetTop;
       }
     })
-    this.scrolling = true;
-    setTimeout(() => {
+    clearTimeout(this.scrollTimeout);
+    this.scrollTimeout = setTimeout(() => {
       this.scrolling = false;
-    }, 1000);
+    }, 800);
     this.stepsContainer.nativeElement.scroll({
       top: scrollAmount,
       behavior: 'smooth' //auto, smooth, initial, inherit
-- 
cgit v1.2.3