fix bootstrap references and fix welcome pop up is already shown logic

bootstrap shown event handling changed. Closes #9
elastic · Sep 18, 2015 · fdf26db · fdf26db
1 parent 29a96ef
commit fdf26db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/public/webpackShims/app.js b/public/webpackShims/app.js
@@ -112,7 +112,7 @@ define([
             }
             if (typeof xhr.status == "number" &&
               ((xhr.status >= 400 && xhr.status < 600) ||
-              (xhr.status >= 200 && xhr.status < 300)
+                (xhr.status >= 200 && xhr.status < 300)
               )) {
               // we have someone on the other side. Add to history
               history.addToHistory(es.getBaseUrl(), es_path, es_method, es_data);
@@ -354,17 +354,15 @@ define([
      * Display the welcome popup if it has not been shown yet
      */
     if (!localStorage.getItem("version_welcome_shown")) {
-      require(['welcome_popup'], function ($welcomePopup) {
-        $welcomePopup.on('shown', function () {
-          localStorage.setItem("version_welcome_shown", '@@MARVEL_REVISION');
-        });
-        $welcomePopup.one('hidden', function () {
-          loadSavedState();
-          setupAutosave();
-        });
-        $welcomePopup.modal('show');
-
+      let $welcomePopup = require('welcome_popup');
+      $welcomePopup.on('shown', function () {
+        localStorage.setItem("version_welcome_shown", '@@SENSE_REVISION');
+      });
+      $welcomePopup.one('hidden', function () {
+        loadSavedState();
+        setupAutosave();
       });
+      $welcomePopup.modal('show');
     }
     else {
       loadSavedState();

diff --git a/public/webpackShims/help_popup.js b/public/webpackShims/help_popup.js
@@ -20,7 +20,7 @@
 define([
   'sense_editor/editor',
   'vendor/jquery',
-  'bootstrap'
+  'vendor/bootstrap'
 ], function (SenseEditor, $) {
   'use strict';
 

diff --git a/public/webpackShims/misc_inputs.js b/public/webpackShims/misc_inputs.js
@@ -24,7 +24,7 @@ define([
   'mappings',
   'output',
   'es',
-  'bootstrap'
+  'vendor/bootstrap'
 ], function ($, history, input, mappings, output, es) {
   'use strict';
 

diff --git a/public/webpackShims/welcome_popup.js b/public/webpackShims/welcome_popup.js
@@ -21,7 +21,7 @@ define([
   'sense_editor/editor',
   'vendor/jquery',
 
-  'bootstrap'
+  'vendor/bootstrap'
 ], function (SenseEditor, $) {
   'use strict';
 
@@ -39,7 +39,7 @@ define([
     'GET index/type/1</div>'
   ].join('\n');
 
-  $welcomePopup.modal();
+  $welcomePopup.modal({show: false});
   $welcomePopup.on('shown', function () {
     $example = $(html)
       .appendTo("#welcome_example_container");