azalea/VeracrossAnalyzerDemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[F] Update index only after loading

Browse Source
This commit is contained in:
Hykilpikonna
2019-11-02 20:20:09 -04:00
parent 04ee69e8e2
commit ac84907a98
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navigation/navigation.ts
+8 -4
View File
@@ -1,7 +1,8 @@
import {Component, Prop, Vue} from 'vue-property-decorator'; import {Component, Prop, Vue} from 'vue-property-decorator';
import {Course} from '@/components/app/app'; import App, {Course} from '@/components/app/app';
import {CourseUtils} from '@/utils/course-utils'; import {CourseUtils} from '@/utils/course-utils';
import {FormatUtils} from '@/utils/format-utils'; import {FormatUtils} from '@/utils/format-utils';
import pWaitFor from 'p-wait-for';
/** /**
* This component is the top navigation bar * This component is the top navigation bar
@@ -21,7 +22,7 @@ export default class Navigation extends Vue
/** /**
* This is called when the instance is created. * This is called when the instance is created.
*/ */
public created() public mounted()
{ {
// Set instance // Set instance
Navigation.instance = this; Navigation.instance = this;
@@ -31,8 +32,11 @@ export default class Navigation extends Vue
if (url == '/' || url == '') url = '/#overall'; if (url == '/' || url == '') url = '/#overall';
window.history.replaceState({lastTab: url.substring(1)}, '', url); window.history.replaceState({lastTab: url.substring(1)}, '', url);
// Update initial index // Update initial index after loading is done
this.updateIndex(url.substring(2), false); pWaitFor(() => App.instance.loading != '').then(() =>
{
this.updateIndex(url.substring(2), false);
});
// Create history state listener // Create history state listener
window.onpopstate = e => window.onpopstate = e =>