|
217 | 217 | }
|
218 | 218 | }
|
219 | 219 |
|
220 |
| - var create_navigate_menu = function(callback) { |
| 220 | + var create_navigate_menu = function(cfg, callback) { |
221 | 221 | $('#kernel_menu').parent().after('<li id="Navigate"/>')
|
222 | 222 | $('#Navigate').addClass('dropdown').append($('<a/>').attr('href', '#').attr('id', 'Navigate_sub'))
|
223 | 223 | $('#Navigate_sub').text('Navigate').addClass('dropdown-toggle').attr('data-toggle', 'dropdown')
|
224 | 224 | $('#Navigate').append($('<ul/>').attr('id', 'Navigate_menu').addClass('dropdown-menu')
|
225 | 225 | .append($("<div/>").attr("id", "navigate_menu").addClass('toc')))
|
226 | 226 |
|
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']) |
229 | 229 | $('#navigate_menu').css('width', $('#Navigate_menu').css('width'))
|
230 | 230 | $('#navigate_menu').css('height', $('#Navigate_menu').height())
|
231 | 231 | } else {
|
232 |
| - IPython.notebook.metadata.toc.nav_menu = {}; |
| 232 | + cfg.nav_menu = {}; |
233 | 233 | events.on("before_save.Notebook",
|
234 | 234 | function() {
|
235 | 235 | 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') |
238 | 238 | } catch (e) {
|
239 | 239 | console.log("[toc2] Error in metadata (navigation menu) - Proceeding", e)
|
240 | 240 | }
|
|
247 | 247 | $('#navigate_menu').css('height', $('#Navigate_menu').height())
|
248 | 248 | },
|
249 | 249 | 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') |
252 | 252 | }
|
253 | 253 | })
|
254 | 254 |
|
|
646 | 646 | });
|
647 | 647 |
|
648 | 648 | // update navigation menu
|
649 |
| - if (cfg.navigate_menu && liveNotebook) { |
| 649 | + if (cfg.navigate_menu) { |
650 | 650 | var pop_nav = function() { //callback for create_nav_menu
|
651 | 651 | $('#navigate_menu').empty().append($('#toc > .toc-item').clone());
|
652 | 652 | }
|
653 | 653 | if ($('#Navigate_menu').length == 0) {
|
654 |
| - create_navigate_menu(pop_nav); |
| 654 | + create_navigate_menu((liveNotebook ? IPython.notebook.metadata.toc : cfg), pop_nav); |
655 | 655 | } else {
|
656 | 656 | pop_nav()
|
657 | 657 | }
|
|
0 commit comments