Skip to content

Commit

Permalink
Switch blast UI config to use the embedded bootstrap.
Browse files Browse the repository at this point in the history
  • Loading branch information
laceysanderson committed Apr 5, 2018
1 parent 821680c commit 11466e8
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions js/lib/require/require-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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',
Expand All @@ -31,18 +31,19 @@ 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',
glyph: '../cvit/draw/glyph'
// 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: {
Expand Down

0 comments on commit 11466e8

Please sign in to comment.