From 11466e8d5fcbc85ad979a9f19e86d6b597128e3b Mon Sep 17 00:00:00 2001 From: Lacey Sanderson Date: Thu, 5 Apr 2018 13:08:19 -0600 Subject: [PATCH] Switch blast UI config to use the embedded bootstrap. --- js/lib/require/require-config.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/lib/require/require-config.js b/js/lib/require/require-config.js index bc80e9e..2ceb8e7 100755 --- a/js/lib/require/require-config.js +++ b/js/lib/require/require-config.js @@ -2,15 +2,15 @@ // for CViTjs in js/cvit require.config({ - + // Enter main.js as single point of entry for the program. - + deps: ["../main"], - + // Set baseURL to library path, as recomended by requirejs - + baseUrl: 'js/lib', - + // Set error handling if failed to load a module catchError: true, @@ -22,7 +22,7 @@ require.config({ // jquery : The ubiquitous JavaScript DOM library // paper : A JavaScript Canvas Library, lets us do all the drawing // d3 : A JavaScript library usually used for graphs, here for data manipulation - + paths: { text : 'require/text', json: 'require/json', @@ -31,6 +31,7 @@ require.config({ mousewheel : 'jquery-mousewheel/jquery.mousewheel.min', paper: 'paper/paper-core.min', hopscotch: 'hopscotch/js/hopscotch.min', + bootstrap: 'bootstrap_embed/', cvit: '../cvit', tools:'../cvit/tools/', draw: '../cvit/draw', @@ -38,11 +39,11 @@ require.config({ // teth:'https://github.com/HubSpot/tether/blob/master/dist/js/tether.min' }, - // bootstrap requires jquery to work, shim makes certain jquery is loaded before. + // bootstrap requires jquery to work, shim makes certain jquery is loaded before. shim : { "bootstrap" : { "deps" :"jquery" } }, - // Remove jquery from global scope. jquery will now only be available if + // Remove jquery from global scope. jquery will now only be available if // defined by the AMD Scope. This allows for more flexibility // in the long run, and better modulartity map: {