From a36dcf2f98ea137dd5fc43531e03df4428fbbaa0 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 28 Jul 2015 11:00:21 -0700 Subject: [PATCH 1/2] export utils.load_extension single, simple, catchable extension load unlike load_extensions, which is the API normally used, which does its own logging of failure to load. --- notebook/static/base/js/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js index d53b219ec..fc3da3edf 100644 --- a/notebook/static/base/js/utils.js +++ b/notebook/static/base/js/utils.js @@ -842,6 +842,7 @@ define([ }; var utils = { + load_extension: load_extension, load_extensions: load_extensions, load_extensions_from_config: load_extensions_from_config, regex_split : regex_split, From ff191ae630fef4f0f0af1499e71b1292c414aa0e Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 28 Jul 2015 11:03:52 -0700 Subject: [PATCH 2/2] load widget extension in js previously was a plain require, which doesn't actually register anything. --- notebook/static/notebook/js/main.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/notebook/static/notebook/js/main.js b/notebook/static/notebook/js/main.js index eee8709a2..71f3567f7 100644 --- a/notebook/static/notebook/js/main.js +++ b/notebook/static/notebook/js/main.js @@ -51,10 +51,8 @@ require([ "use strict"; // BEGIN HARDCODED WIDGETS HACK - // Don't include in above require call, avoiding r.js - // and crash on import failure. - require(['nbextensions/widgets/notebook/js/extension'], function(){}, function(err) { - console.error('ipywidgets package not installed. Widgets are not available.'); + utils.load_extension('widgets/notebook/js/extension').catch(function () { + console.warn('ipywidgets package not installed. Widgets are not available.'); }); // END HARDCODED WIDGETS HACK