From 5ae89761b0135241e730d2b474cdb0d15ba1d803 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@yahoo.com>
Date: Thu, 16 Aug 2018 16:53:37 -0500
Subject: [PATCH] Prevent tour from displaying twice (#10594)

* Prevent tour from displaying twice

* Removed forced and prevent overlay click
---
 website/client/mixins/guide.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/website/client/mixins/guide.js b/website/client/mixins/guide.js
index 0d5029fb71..4dd3d9be88 100644
--- a/website/client/mixins/guide.js
+++ b/website/client/mixins/guide.js
@@ -1,7 +1,9 @@
 import times from 'lodash/times';
-import Intro from 'intro.js/';
+import introjs from 'intro.js';
 import * as Analytics from 'client/libs/analytics';
 
+let showingTour = false;
+
 export default {
   data () {
     return {
@@ -13,6 +15,8 @@ export default {
   },
   watch: {
     $route () {
+      if (showingTour) return;
+      showingTour = true;
       this.routeChange();
     },
   },
@@ -168,13 +172,15 @@ export default {
       });
 
       // @TODO: Do we always need to initialize here?
-      let intro = Intro.introJs();
+      const intro = introjs();
       intro.setOptions({
+        exitOnOverlayClick: false,
         steps: opts.steps,
         doneLabel: this.$t('letsgo'),
       });
       intro.start();
       intro.oncomplete(() => {
+        showingTour = false;
         this.markTourComplete(chapter);
       });
     },
@@ -187,19 +193,6 @@ export default {
         return;
       }
 
-      // if (true) { // -2 indicates complete
-      //   if (chapter === 'intro') {
-      //     // Manually show bunny scroll reward
-      //     // let rewardData = {
-      //     //   reward: [Shared.content.quests.dustbunnies],
-      //     //   rewardKey: ['inventory_quest_scroll_dustbunnies'],
-      //     //   rewardText: Shared.content.quests.dustbunnies.text(),
-      //     //   message: this.$t('checkinEarned'),
-      //     //   nextRewardAt: 1,
-      //     // };
-      //     // @TODO: Notification.showLoginIncentive(this.user, rewardData, Social.loadWidgets);
-      //   }
-
       // Mark tour complete
       ups[`flags.tour.${chapter}`] = -2; // @TODO: Move magic numbers to enum
 
@@ -211,7 +204,6 @@ export default {
         eventValue: lastKnownStep,
         complete: true,
       });
-      // }
 
       this.$store.dispatch('user:set', ups);
     },