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

# Conflicts:
#	frontend/src/app/_elements/form-model/form-model.component.ts

2 files changed, 12 insertions, 6 deletions

diff --git a/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.html b/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.html
index 00ee98c5..2b3678ce 100644
--- a/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.html
+++ b/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.html
@@ -1,11 +1,13 @@
 <h1 mat-dialog-title class="text-center">Sačuvaj eksperiment</h1>
 <div mat-dialog-content class="mt-5 mb-4 mx-1">
-    Naziv eksperimenta:<br>
-    <mat-form-field [style.width.px]=250>
-        <input type="text" matInput [(ngModel)]="selectedName" cdkFocusInitial>
-    </mat-form-field>
-    <p *ngIf="wrongAlreadyExists" class="wrongInput">Izaberi drugi naziv za eskperiment.<br>Eskperiment sa unetim nazivom već postoji u kolekciji.</p>
-    <p *ngIf="wrongEmptyName" class="wrongInput">Unesite naziv eksperimenta.</p>
+    <form (keydown)="saveWithEnterKey($event)">
+        Naziv eksperimenta:<br>
+        <mat-form-field [style.width.px]=250>
+            <input type="text" matInput [(ngModel)]="selectedName" cdkFocusInitial [ngModelOptions]="{standalone: true}">
+        </mat-form-field>
+        <p *ngIf="wrongAlreadyExists" class="wrongInput">Izaberi drugi naziv za eskperiment.<br>Eskperiment sa unetim nazivom već postoji u kolekciji.</p>
+        <p *ngIf="wrongEmptyName" class="wrongInput">Unesite naziv eksperimenta.</p>
+    </form>
 </div>
 <div mat-dialog-actions class="justify-content-center">
     <button id="btnYes" mat-stroked-button color="basic" (click)="onYesClick()">Sačuvaj</button>
diff --git a/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.ts b/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.ts
index 610af351..3c19e732 100644
--- a/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.ts
+++ b/frontend/src/app/_modals/save-experiment-dialog/save-experiment-dialog.component.ts
@@ -31,6 +31,10 @@ export class SaveExperimentDialogComponent implements OnInit {
     this.dialogRef.close();
   }
 
+  saveWithEnterKey(keyboardEvent: KeyboardEvent) {
+    if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+      this.onYesClick();
+  }
   onYesClick() {
     if (this.selectedName == "") {
       this.wrongEmptyName = true;