Skip to content

make execute_time robust to loading before notebook finishes loading #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcb91 merged 2 commits into from
Feb 13, 2017
Merged

make execute_time robust to loading before notebook finishes loading #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4dd00e
jcb91 Feb 12, 2017
d1a0cb0
jcb91 Feb 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/jupyter_contrib_nbextensions/nbextensions/execute_time/ExecuteTime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ define([
) {
'use strict';

var mod_name = 'ExecuteTime';
var log_prefix = '[' + mod_name + ']';

var CodeCell = codecell.CodeCell;

function patch_CodeCell_get_callbacks () {
console.log('[ExecuteTime] patching CodeCell.prototype.get_callbacks to insert an ExecuteTime shell.reply callback');
console.log(log_prefix, 'patching CodeCell.prototype.get_callbacks to insert an ExecuteTime shell.reply callback');
var old_get_callbacks = CodeCell.prototype.get_callbacks;
CodeCell.prototype.get_callbacks = function () {
var callbacks = old_get_callbacks.apply(this, arguments);
Expand Down Expand Up @@ -201,6 +204,11 @@ define([
return timing_area;
}

function update_all_timing_areas () {
console.log(log_prefix, 'updating all timing areas');
Jupyter.notebook.get_cells().forEach(update_timing_area);
}

function add_css(url) {
$('<link/>')
.attr({
Expand All @@ -214,14 +222,13 @@ define([
function load_jupyter_extension () {
// try to load jquery-ui
if ($.ui === undefined) {
require('jquery-ui', function ($) {}, function (err) {
require(['jquery-ui'], function ($) {}, function (err) {
// try to load using the older, non-standard name (without hyphen)
require(['jqueryui'], function ($) {}, function (err) {});
require(['jqueryui'], function ($) {}, function (err) {
console.log(log_prefix, 'couldn\'t find jquery-ui, so no animations');
});
});
}
if ($.ui === undefined) {
console.log('[ExecuteTime] couldn\'t find jquery-ui, so no animations');
}

add_css('./ExecuteTime.css');

Expand All @@ -231,7 +238,11 @@ define([
create_menu();

// add any existing timing info
Jupyter.notebook.get_cells().forEach(update_timing_area);
events.on("notebook_loaded.Notebook", update_all_timing_areas);
if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) {
// notebook already loaded, so we missed the event, so update all
update_all_timing_areas();
}
}

return {
Expand Down
⚡