Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/app-routing.module.ts
#	frontend/src/app/app.module.ts

1 files changed, 9 insertions, 3 deletions

diff --git a/frontend/src/app/Shared.ts b/frontend/src/app/Shared.ts
index 59a2716d..d088fff9 100644
--- a/frontend/src/app/Shared.ts
+++ b/frontend/src/app/Shared.ts
@@ -1,4 +1,4 @@
-import { ElementRef } from "@angular/core";
+import { ElementRef, EventEmitter } from "@angular/core";
 import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { AlertDialogComponent } from './_modals/alert-dialog/alert-dialog.component';
@@ -27,18 +27,24 @@ class Shared {
             });
         }
     }
-    openYesNoDialog(title: string, message: string,yesFunction:Function): void {
+    openYesNoDialog(title: string, message: string, yesFunction: Function): void {
 
         if (this.dialog) {
             const dialogRef = this.dialog.open(YesNoDialogComponent, {
                 width: '350px',
-                data: { title: title, message: message,yesFunction}
+                data: { title: title, message: message, yesFunction }
             });
             dialogRef.afterClosed().subscribe(res => {
                 //nesto
             });
         }
     }
+
+    bgScroll: EventEmitter<number> = new EventEmitter();
+
+    emitBGScrollEvent(value: number) {
+        this.bgScroll.emit(value);
+    }
 }
 
 export default new Shared(false);
\ No newline at end of file