cleaned up code-editor further

Tahler · Sep 13, 2016 · 3a502b9 · 3a502b9
1 parent 63e2937
commit 3a502b9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/app/code-editor/code-editor.component.ts b/src/app/code-editor/code-editor.component.ts
@@ -16,22 +16,31 @@ export class CodeEditorComponent implements OnInit {
   @ViewChild('langDropdown') langDropdown: LanguageDropdownComponent;
 
   lang: Language;
-  submission: Submission;
 
+  submission: Submission;
   @Output() submissionChange = new EventEmitter();
 
   constructor(private templateService: SubmissionTemplateService) { }
 
   ngOnInit() {
-    this.templateService
-        .getDefaultSubmission()
-        .take(1)
-        .subscribe(submission => {
-           this.submission = submission;
-           // Initial setup
-           this.codeMirror.src = submission.src;
-           this.langDropdown.lang = submission.lang;
-        });
+    if (this.submission) {
+      this.onSubmissionInit();
+    } else {
+      this.templateService
+          .getDefaultSubmission()
+          .take(1)
+          .subscribe(submission => {
+            this.submission = submission;
+            this.onSubmissionInit();
+          });
+    }
+  }
+
+  onSubmissionInit() {
+    // Initial setup
+    this.codeMirror.src = this.submission.src;
+    this.langDropdown.lang = this.submission.lang;
+    this.submissionChange.emit(this.submission);
   }
 
   // Called on codemirror text change

diff --git a/src/app/problems/problem/view/view.component.ts b/src/app/problems/problem/view/view.component.ts
@@ -37,7 +37,9 @@ export class ViewComponent implements OnInit, OnDestroy {
                 .subscribe(user => this.creator = user);
           }
         });
-    this.sharingService.submissionObservable.subscribe(submission => this.submission = submission);
+    this.sharingService
+        .submissionObservable
+        .subscribe(submission => this.submission = submission);
   }
 
   ngOnDestroy() {