From e3b011003ddebb9e79c98f0fc843f96fcdecb522 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 3 Apr 2020 17:05:14 -0400 Subject: [PATCH] [F] Remove problematic App.instance usage and pass in app --- src/components/navigation/navigation.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/navigation/navigation.ts b/src/components/navigation/navigation.ts index 9e2e2f1..6a4583b 100644 --- a/src/components/navigation/navigation.ts +++ b/src/components/navigation/navigation.ts @@ -3,7 +3,7 @@ import Course from '@/logic/course'; import Constants from '@/constants'; import LoginUser from '@/logic/login-user'; import NavController from '@/logic/nav-controller'; -import App from '@/components/app/app'; +import App from '@/components/app/app.ts'; /** * This component is the top navigation bar @@ -11,6 +11,7 @@ import App from '@/components/app/app'; @Component export default class Navigation extends Vue { + @Prop({required: true}) app: App; @Prop({required: true}) nav: NavController; @Prop({required: true}) courses: Course[]; @Prop({required: true}) user: LoginUser; @@ -137,7 +138,7 @@ export default class Navigation extends Vue } case 'switch-dark': { - App.instance.darkMode = !App.instance.darkMode; + this.app.darkMode = !this.app.darkMode; if (this.isDark()) this.$cookies.set('dark', true); else this.$cookies.remove('dark'); @@ -149,7 +150,7 @@ export default class Navigation extends Vue isDark() { - return App.instance.darkMode; + return this.app.darkMode; } get version() {return Constants.VERSION}