diff --git a/IPython/html/static/notebook/js/widgetmanager.js b/IPython/html/static/notebook/js/widgetmanager.js index cb26253..ee31373 100644 --- a/IPython/html/static/notebook/js/widgetmanager.js +++ b/IPython/html/static/notebook/js/widgetmanager.js @@ -21,8 +21,8 @@ // Use require.js 'define' method so that require.js is intelligent enough to // syncronously load everything within this file when it is being 'required' // elsewhere. - define(["components/underscore/underscore-min", - "components/backbone/backbone-min", + define(["underscore", + "backbone", ], function (underscore, backbone) { //-------------------------------------------------------------------- diff --git a/IPython/html/static/notebook/js/widgets/base.js b/IPython/html/static/notebook/js/widgets/base.js index fb8b7ef..e6d561d 100644 --- a/IPython/html/static/notebook/js/widgets/base.js +++ b/IPython/html/static/notebook/js/widgets/base.js @@ -15,8 +15,8 @@ **/ define(["notebook/js/widgetmanager", - "components/underscore/underscore-min", - "components/backbone/backbone-min"], + "underscore", + "backbone"], function(widget_manager, underscore, backbone){ //-------------------------------------------------------------------- diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html index 5bef21d..517b365 100644 --- a/IPython/html/templates/page.html +++ b/IPython/html/templates/page.html @@ -21,7 +21,18 @@ require.config({ baseUrl: '{{static_url("")}}', paths: { - nbextensions : '{{ base_project_url }}nbextensions' + nbextensions : '{{ base_project_url }}nbextensions', + underscore : '{{static_url()}}components/underscore/underscore-min', + backbone : '{{static_url()}}components/backbone/backbone-min', + }, + shim: { + underscore: { + exports: '_' + }, + backbone: { + deps: ["underscore", "jquery"], + exports: "Backbone" + } } });