Skip to content

Commit 9df2f08

Browse files
authored
Merge pull request ipython-contrib#1535 from cailiang9/patch-1
Support non-live notebook such as nbconvert output
2 parents 60199e8 + 1fe12b3 commit 9df2f08

File tree

1 file changed

+10
-10
lines changed
  • src/jupyter_contrib_nbextensions/nbextensions/toc2

1 file changed

+10
-10
lines changed

src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,24 +217,24 @@
217217
}
218218
}
219219

220-
var create_navigate_menu = function(callback) {
220+
var create_navigate_menu = function(cfg, callback) {
221221
$('#kernel_menu').parent().after('<li id="Navigate"/>')
222222
$('#Navigate').addClass('dropdown').append($('<a/>').attr('href', '#').attr('id', 'Navigate_sub'))
223223
$('#Navigate_sub').text('Navigate').addClass('dropdown-toggle').attr('data-toggle', 'dropdown')
224224
$('#Navigate').append($('<ul/>').attr('id', 'Navigate_menu').addClass('dropdown-menu')
225225
.append($("<div/>").attr("id", "navigate_menu").addClass('toc')))
226226

227-
if (IPython.notebook.metadata.toc['nav_menu']) {
228-
$('#Navigate_menu').css(IPython.notebook.metadata.toc['nav_menu'])
227+
if (cfg['nav_menu']) {
228+
$('#Navigate_menu').css(cfg['nav_menu'])
229229
$('#navigate_menu').css('width', $('#Navigate_menu').css('width'))
230230
$('#navigate_menu').css('height', $('#Navigate_menu').height())
231231
} else {
232-
IPython.notebook.metadata.toc.nav_menu = {};
232+
cfg.nav_menu = {};
233233
events.on("before_save.Notebook",
234234
function() {
235235
try {
236-
IPython.notebook.metadata.toc.nav_menu['width'] = $('#Navigate_menu').css('width')
237-
IPython.notebook.metadata.toc.nav_menu['height'] = $('#Navigate_menu').css('height')
236+
cfg.nav_menu['width'] = $('#Navigate_menu').css('width')
237+
cfg.nav_menu['height'] = $('#Navigate_menu').css('height')
238238
} catch (e) {
239239
console.log("[toc2] Error in metadata (navigation menu) - Proceeding", e)
240240
}
@@ -247,8 +247,8 @@
247247
$('#navigate_menu').css('height', $('#Navigate_menu').height())
248248
},
249249
stop: function(event, ui) {
250-
IPython.notebook.metadata.toc.nav_menu['width'] = $('#Navigate_menu').css('width')
251-
IPython.notebook.metadata.toc.nav_menu['height'] = $('#Navigate_menu').css('height')
250+
cfg.nav_menu['width'] = $('#Navigate_menu').css('width')
251+
cfg.nav_menu['height'] = $('#Navigate_menu').css('height')
252252
}
253253
})
254254

@@ -646,12 +646,12 @@
646646
});
647647

648648
// update navigation menu
649-
if (cfg.navigate_menu && liveNotebook) {
649+
if (cfg.navigate_menu) {
650650
var pop_nav = function() { //callback for create_nav_menu
651651
$('#navigate_menu').empty().append($('#toc > .toc-item').clone());
652652
}
653653
if ($('#Navigate_menu').length == 0) {
654-
create_navigate_menu(pop_nav);
654+
create_navigate_menu((liveNotebook ? IPython.notebook.metadata.toc : cfg), pop_nav);
655655
} else {
656656
pop_nav()
657657
}

0 commit comments

Comments
 (0)