mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

add bootstrap shim for require

Browse Source 
it was possible for bootstrap js to load before jquery,
causing failures in the dashboard.
This commit is contained in:
MinRK 2014-07-22 15:53:16 -07:00
parent f3e599e0c4
commit d345546d15
10 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/html/static/notebook/js/menubar.js
View File

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

4
IPython/html/static/tree/js/main.js
View File

@ -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,
$,

2
IPython/html/static/widgets/js/widget_bool.js
View File

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

2
IPython/html/static/widgets/js/widget_button.js
View File

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

2
IPython/html/static/widgets/js/widget_container.js
View File

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

2
IPython/html/static/widgets/js/widget_int.js
View File

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

2
IPython/html/static/widgets/js/widget_selection.js
View File

@ -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({

2
IPython/html/static/widgets/js/widget_selectioncontainer.js
View File

@ -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({

2
IPython/html/static/widgets/js/widget_string.js
View File

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

6
IPython/html/templates/page.html
View File

@ -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: {