From fdaba30d3f55ae1ebd0198f503129b00aba718ad Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Thu, 6 Jun 2019 13:49:07 +0800
Subject: [PATCH] complete upgrade to angular

---
 src/app/file-explorer/file-explorer.component.ts | 3 +--
 src/app/launch-dialog/launch-dialog.component.ts | 3 +--
 src/polyfills.ts                                 | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/file-explorer/file-explorer.component.ts b/src/app/file-explorer/file-explorer.component.ts
index bd3751a..e2b842c 100644
--- a/src/app/file-explorer/file-explorer.component.ts
+++ b/src/app/file-explorer/file-explorer.component.ts
@@ -14,8 +14,7 @@ import { RenameDialogComponent } from './modals/renameDialog/renameDialog.compon
 export class FileExplorerComponent {
   constructor(public dialog: MatDialog) {}
 
-  @ViewChild(MatMenuTrigger)
-  contextMenu: MatMenuTrigger;
+    @ViewChild(MatMenuTrigger, {static: false }) contextMenu: MatMenuTrigger;
 
   contextMenuPosition = { x: '0px', y: '0px' };
 
diff --git a/src/app/launch-dialog/launch-dialog.component.ts b/src/app/launch-dialog/launch-dialog.component.ts
index 8239440..783c09c 100644
--- a/src/app/launch-dialog/launch-dialog.component.ts
+++ b/src/app/launch-dialog/launch-dialog.component.ts
@@ -17,8 +17,7 @@ export class LaunchDialogComponent implements OnInit {
   batchcmdsafeurl: any;
   appconfigsafeurl: any;
   rmListen: any;
-  @ViewChild('launchbtn', { read: ElementRef })
-  launchbtn: ElementRef;
+  @ViewChild('launchbtn', { read: ElementRef, static: false }) launchbtn: ElementRef;
   setFocus: Boolean;
   sub: Subscription;
 
diff --git a/src/polyfills.ts b/src/polyfills.ts
index af84770..81a2d68 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -43,7 +43,7 @@
 
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
+//import 'core-js/es7/reflect';
 
 
 /**
-- 
GitLab