Merge pull request #6190 from minrk/bootstrap-shim

add bootstrap shim for require

IPython/html/static/notebook/js/menubar.js

@@ -6,7 +6,7 b' define(['
     'jquery',
     'base/js/utils',
     'notebook/js/tour',
-    'components/bootstrap/js/bootstrap.min',
+    'bootstrap',
 ], function(IPython, $, utils, tour) {
     "use strict";
     

IPython/html/static/tree/js/main.js

@@ -12,8 +12,8 b' 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, 
     $, 

IPython/html/static/widgets/js/widget_bool.js

@@ -4,7 +4,7 b''
 define([
     "widgets/js/widget",
     "jquery",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, $){
 
     var CheckboxView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_button.js

@@ -4,7 +4,7 b''
 define([
     "widgets/js/widget",
     "jquery",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, $){
 
     var ButtonView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_container.js

@@ -4,7 +4,7 b''
 define([
     "widgets/js/widget",
     "jqueryui",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, $){
 
     var ContainerView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_int.js

@@ -4,7 +4,7 b''
 define([
     "widgets/js/widget",
     "jqueryui",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, $){
     
     var IntSliderView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_selection.js

@@ -5,7 +5,7 b' define(['
     "widgets/js/widget",
     "base/js/utils",
     "jquery",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, utils, $){
 
     var DropdownView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_selectioncontainer.js

@@ -5,7 +5,7 b' define(['
     "widgets/js/widget",
     "base/js/utils",
     "jquery",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, utils, $){
 
     var AccordionView = widget.DOMWidgetView.extend({

IPython/html/static/widgets/js/widget_string.js

@@ -4,7 +4,7 b''
 define([
     "widgets/js/widget",
     "jquery",
-    "components/bootstrap/js/bootstrap.min",
+    "bootstrap",
 ], function(widget, $){
 
     var HTMLView = widget.DOMWidgetView.extend({  

IPython/html/templates/page.html

@@ -23,6 +23,7 b''
             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 b''
               deps: ["underscore", "jquery"],
               exports: "Backbone"
             },
+            bootstrap: {
+              deps: ["jquery"],
+              exports: "bootstrap"
+            },
             bootstraptour: {
+              deps: ["bootstrap"],
               exports: "Tour"
             },
             dateformat: {