krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 05:37:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(modals): better stack???

Browse Source
This commit is contained in:
Sabe Jones
2018-11-02 14:58:32 -05:00
parent f871c7cf63
commit 818d5e4eb6
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
website/client/components/notifications.vue
View File

@@ -317,18 +317,12 @@ export default {
this.$store.dispatch('user:fetch'),
this.$store.dispatch('tasks:fetchUserTasks'),
]).then(() => {
this.debounceCheckUserAchievements();
// @TODO: This is a timeout to ensure dom is loaded
window.setTimeout(() => {
this.initTour();
if (this.user.flags.tour.intro === this.TOUR_END || !this.user.flags.welcomed) return;
this.goto('intro', 0);
this.runForcedModals();
}, 2000);
this.forceVerifyUsername();
this.runYesterDailies();
this.debounceCheckUserAchievements();
// Do not remove the event listener as it's live for the entire app lifetime
document.addEventListener('mousemove', this.checkNextCron);
@@ -344,6 +338,14 @@ export default {
document.removeEventListener('keydown', this.checkNextCron);
},
methods: {
runForcedModals () {
if (!this.user.flags.verifiedUsername) return this.$root.$emit('bv::show::modal', 'verify-username');
this.initTour();
if (!(this.user.flags.tour.intro === this.TOUR_END || !this.user.flags.welcomed)) return this.goto('intro', 0);
return this.runYesterDailies();
},
showDeathModal () {
this.playSound('Death');
this.$root.$emit('bv::show::modal', 'death');
@@ -471,11 +473,6 @@ export default {
this.nextCron = Number(nextCron.format('x'));
this.$store.state.isRunningYesterdailies = false;
},
forceVerifyUsername () {
if (this.user.flags.verifiedUsername) return;
this.$root.$emit('bv::show::modal', 'verify-username');
},
async runYesterDailies () {
if (this.$store.state.isRunningYesterdailies) return;
this.$store.state.isRunningYesterdailies = true;