diff --git a/IPython/html/static/notebook/js/menubar.js b/IPython/html/static/notebook/js/menubar.js index f2c0b65..f7d5a81 100644 --- a/IPython/html/static/notebook/js/menubar.js +++ b/IPython/html/static/notebook/js/menubar.js @@ -6,7 +6,7 @@ define([ 'jquery', 'base/js/utils', 'notebook/js/tour', - 'components/bootstrap/js/bootstrap.min', + 'bootstrap', ], function(IPython, $, utils, tour) { "use strict"; diff --git a/IPython/html/static/tree/js/main.js b/IPython/html/static/tree/js/main.js index 88ea1ff..e15a576 100644 --- a/IPython/html/static/tree/js/main.js +++ b/IPython/html/static/tree/js/main.js @@ -12,8 +12,8 @@ require([ 'tree/js/sessionlist', 'tree/js/kernellist', 'auth/js/loginwidget', - 'components/jquery-ui/ui/minified/jquery-ui.min', - 'components/bootstrap/js/bootstrap.min', + 'jqueryui', + 'bootstrap', ], function( IPython, $, diff --git a/IPython/html/static/widgets/js/widget_bool.js b/IPython/html/static/widgets/js/widget_bool.js index 5bb86d7..5a3ba18 100644 --- a/IPython/html/static/widgets/js/widget_bool.js +++ b/IPython/html/static/widgets/js/widget_bool.js @@ -4,7 +4,7 @@ define([ "widgets/js/widget", "jquery", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, $){ var CheckboxView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_button.js b/IPython/html/static/widgets/js/widget_button.js index 071c836..3ff7c23 100644 --- a/IPython/html/static/widgets/js/widget_button.js +++ b/IPython/html/static/widgets/js/widget_button.js @@ -4,7 +4,7 @@ define([ "widgets/js/widget", "jquery", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, $){ var ButtonView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_container.js b/IPython/html/static/widgets/js/widget_container.js index 427d3de..f09c1e9 100644 --- a/IPython/html/static/widgets/js/widget_container.js +++ b/IPython/html/static/widgets/js/widget_container.js @@ -4,7 +4,7 @@ define([ "widgets/js/widget", "jqueryui", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, $){ var ContainerView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_int.js b/IPython/html/static/widgets/js/widget_int.js index a5fa196..2ef71b1 100644 --- a/IPython/html/static/widgets/js/widget_int.js +++ b/IPython/html/static/widgets/js/widget_int.js @@ -4,7 +4,7 @@ define([ "widgets/js/widget", "jqueryui", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, $){ var IntSliderView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_selection.js b/IPython/html/static/widgets/js/widget_selection.js index 384cabd..901ac99 100644 --- a/IPython/html/static/widgets/js/widget_selection.js +++ b/IPython/html/static/widgets/js/widget_selection.js @@ -5,7 +5,7 @@ define([ "widgets/js/widget", "base/js/utils", "jquery", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, utils, $){ var DropdownView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_selectioncontainer.js b/IPython/html/static/widgets/js/widget_selectioncontainer.js index 14c45b4..e96722e 100644 --- a/IPython/html/static/widgets/js/widget_selectioncontainer.js +++ b/IPython/html/static/widgets/js/widget_selectioncontainer.js @@ -5,7 +5,7 @@ define([ "widgets/js/widget", "base/js/utils", "jquery", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, utils, $){ var AccordionView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/static/widgets/js/widget_string.js b/IPython/html/static/widgets/js/widget_string.js index ff09c26..c8b91d8 100644 --- a/IPython/html/static/widgets/js/widget_string.js +++ b/IPython/html/static/widgets/js/widget_string.js @@ -4,7 +4,7 @@ define([ "widgets/js/widget", "jquery", - "components/bootstrap/js/bootstrap.min", + "bootstrap", ], function(widget, $){ var HTMLView = widget.DOMWidgetView.extend({ diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html index b882f51..44fcab8 100644 --- a/IPython/html/templates/page.html +++ b/IPython/html/templates/page.html @@ -23,6 +23,7 @@ underscore : 'components/underscore/underscore-min', backbone : 'components/backbone/backbone-min', jquery: 'components/jquery/jquery.min', + bootstrap: 'components/bootstrap/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', dateformat: 'dateformat/date.format', jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min', @@ -35,7 +36,12 @@ deps: ["underscore", "jquery"], exports: "Backbone" }, + bootstrap: { + deps: ["jquery"], + exports: "bootstrap" + }, bootstraptour: { + deps: ["bootstrap"], exports: "Tour" }, dateformat: {