From 1547b3e9a5e38329dbbc2b06f07ac6b2f5a964e2 Mon Sep 17 00:00:00 2001 From: Sukneet Date: Tue, 19 Sep 2017 16:19:36 -0600 Subject: [PATCH 1/3] [freeze] update add_buttons_group to use action instead of button --- .../nbextensions/freeze/main.js | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js b/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js index 8a23173..95f9e3c 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js @@ -161,24 +161,21 @@ define([ function load_extension () { Jupyter.toolbar.add_buttons_group([ - { - id : 'make_normal', - label : 'lift restrictions from selected cells', + Jupyter.actions.register ({ + help : 'lift restrictions from selected cells', icon : 'fa-unlock-alt', - callback : make_normal_selected - }, - { - id : 'make_read_only', - label : 'make selected cells read-only', + handler : make_normal_selected + },'make_normal'), + Jupyter.actions.register({ + help : 'make selected cells read-only', icon: 'fa-lock', - callback : make_read_only_selected - }, - { - id : 'freeze_cells', - label : 'freeze selected cells', + handler : make_read_only_selected + },'make_read_only'), + Jupyter.actions.register({ + help : 'freeze selected cells', icon : 'fa-asterisk', - callback : make_frozen_selected - } + handler : make_frozen_selected + },'freeze_cells') ]); patch_CodeCell_execute(); From b7aa1bd8160cd132c0e8ff877d5c0515b67a2df9 Mon Sep 17 00:00:00 2001 From: Sukneet Date: Wed, 20 Sep 2017 22:08:14 -0600 Subject: [PATCH 2/3] update add_buttons_group to use action instead of button --- .../nbextensions/addbefore/main.js | 20 ++++++++-------- .../code_font_size/code_font_size.js | 20 ++++++++-------- .../nbextensions/collapsible_headings/main.js | 24 +++++++++++-------- .../nbextensions/datestamper/main.js | 13 +++++----- .../nbextensions/equation-numbering/main.js | 11 ++++----- .../nbextensions/exercise/main.js | 11 ++++----- .../nbextensions/exercise2/main.js | 11 ++++----- .../nbextensions/export_embedded/main.js | 17 ++++++------- .../nbextensions/gist_it/main.js | 12 ++++++---- .../nbextensions/help_panel/help_panel.js | 21 ++++++++-------- .../nbextensions/hide_input/main.js | 19 ++++++++------- .../nbextensions/hide_input_all/main.js | 19 ++++++++------- .../nbextensions/nbTranslate/main.js | 23 +++++++++--------- .../nbextensions/notify/notify.js | 11 ++++----- .../nbextensions/printview/main.js | 11 ++++----- .../nbextensions/qtconsole/qtconsole.js | 11 ++++----- .../nbextensions/scroll_down/main.js | 11 ++++----- .../nbextensions/search-replace/main.js | 11 ++++----- .../nbextensions/spellchecker/main.js | 15 ++++++------ .../nbextensions/toc2/main.js | 13 +++++----- .../nbextensions/varInspector/main.js | 13 +++++----- .../nbextensions/zenmode/main.js | 10 ++++---- 22 files changed, 166 insertions(+), 161 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js b/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js index 9d6f786..d864de9 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js @@ -9,24 +9,24 @@ define([ var load_extension = function() { Jupyter.toolbar.add_buttons_group([ - { - 'label' : 'Insert Cell Above', - 'icon' : 'fa-arrow-circle-o-up', - 'callback': function () { + Jupyter.actions.register ({ + 'help' : 'Insert Cell Above', + 'icon' : 'fa-arrow-circle-o-up', + 'handler': function () { Jupyter.notebook.insert_cell_above('code'); Jupyter.notebook.select_prev(); Jupyter.notebook.focus_cell(); } - }, - { - 'label' : 'Insert Cell Below', - 'icon' : 'fa-arrow-circle-o-down', - 'callback': function () { + }), + Jupyter.actions.register ({ + 'help' : 'Insert Cell Below', + 'icon' : 'fa-arrow-circle-o-down', + 'handler': function () { Jupyter.notebook.insert_cell_below('code'); Jupyter.notebook.select_next(); Jupyter.notebook.focus_cell(); } - } + }) ]); $('#insert_above_below').remove() diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js b/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js index 4317bc2..cf2384e 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js @@ -47,20 +47,20 @@ define([ /* * Buttons to increase/decrease code font size */ - { - 'label' : 'Increase code font size', - 'icon' : 'fa-search-plus', - 'callback': function () { + Jupyter.actions.register ({ + 'help' : 'Increase code font size', + 'icon' : 'fa-search-plus', + 'handler': function () { $( document ).ready(code_change_fontsize(true)); } - }, - { - 'label' : 'Decrease code font size', - 'icon' : 'fa-search-minus', - 'callback': function () { + }), + Jupyter.actions.register ({ + 'help' : 'Decrease code font size', + 'icon' : 'fa-search-minus', + 'handler': function () { $( document ).ready(code_change_fontsize(false)); } - } + }) ]); }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js index 80bb5e4..e913bdb 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js @@ -834,10 +834,11 @@ function add_buttons_and_shortcuts () { // (Maybe) add buttons to the toolbar if (params.add_button) { - Jupyter.toolbar.add_buttons_group([{ - label: 'toggle heading', - icon: 'fa-angle-double-up', - callback: function () { + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'toggle heading', + icon : 'fa-angle-double-up', + handler: function () { /** * Collapse the closest uncollapsed heading above the * currently selected cell. @@ -850,13 +851,15 @@ Jupyter.notebook.select(Jupyter.notebook.find_cell_index(heading_cell)); } } - }]); + }) + ]); } if (params.add_all_cells_button) { - Jupyter.toolbar.add_buttons_group([{ - label: 'toggle all headings', - icon: 'fa-angle-double-up', - callback: function () { + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'toggle all headings', + icon : 'fa-angle-double-up', + handler: function () { /** * Collapse/uncollapse all heading cells based on status of first */ @@ -869,7 +872,8 @@ } } } - }]); + }) + ]); } if (params.add_insert_header_buttons) { Jupyter.toolbar.add_buttons_group([ diff --git a/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js b/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js index c981d2b..7869d76 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js @@ -27,12 +27,11 @@ define([ var load_ipython_extension = function () { IPython.toolbar.add_buttons_group([ - { - id : 'datestamp', - label : 'insert datestamp', - icon : 'fa-calendar', - callback : datestamp - } + Jupyter.actions.register ({ + help : 'insert datestamp', + icon : 'fa-calendar', + handler: datestamp + }, 'datestamp') ]); }; @@ -40,4 +39,4 @@ define([ load_ipython_extension : load_ipython_extension, }; return extension; -}); \ No newline at end of file +}); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js b/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js index f0348be..90cc2d6 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js @@ -12,11 +12,10 @@ define([ var load_ipython_extension = function() { IPython.toolbar.add_buttons_group([ - { - id: 'reset_numbering', - label: 'Reset equation numbering', - icon: 'fa-sort-numeric-asc', - callback: function () { + Jupyter.actions.register ({ + help : 'Reset equation numbering', + icon : 'fa-sort-numeric-asc', + handler: function () { MathJax.Hub.Queue( ["resetEquationNumbers", MathJax.InputJax.TeX], ["PreProcess", MathJax.Hub], @@ -24,7 +23,7 @@ define([ ); $('#reset_numbering').blur(); } - } + }, 'reset_numbering') ]); MathJax.Hub.Config({ TeX: { equationNumbers: { autoNumber: "AMS" } } diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js index 0144314..dae4a82 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js @@ -132,15 +132,14 @@ define([ function load_ipython_extension(){ IPython.toolbar.add_buttons_group([ - { - id : 'hide_solutions', - label : 'Exercise: Create/Remove solutions', - icon : 'fa-mortar-board', - callback : function () { + Jupyter.actions.register ({ + help : 'Exercise: Create/Remove solutions', + icon : 'fa-mortar-board', + handler : function () { //console.log(IPython.notebook.get_selected_cells()) hide_solutions(); } - } + }, 'hide_solutions') ]); /** diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js index ccea549..41bc295 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js @@ -128,14 +128,13 @@ id=\"myCheck' + cbx + '\" >\ function load_ipython_extension(){ IPython.toolbar.add_buttons_group([ - { - id : 'process_solution', - label : 'Exercise2: Create/Remove solution', - icon : 'fa-toggle-on', - callback : function () { + Jupyter.actions.register ({ + help : 'Exercise2: Create/Remove solution', + icon : 'fa-toggle-on', + handler : function () { process_solution(); } - } + }, 'process_solution') ]); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js b/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js index 43b91c1..3a44a54 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js @@ -33,14 +33,15 @@ define([ /* Add also a Button, currently disabled */ /* - Jupyter.toolbar.add_buttons_group([{ - id : 'export_embeddedhtml', - label : 'Embedded HTML Export', - icon : 'fa-save', - callback : function() { - Jupyter.menubar._nbconvert('html_embed', true); - } - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Embedded HTML Export', + icon : 'fa-save', + handler: function() { + Jupyter.menubar._nbconvert('html_embed', true); + } + }, 'export_embeddedhtml') + ]); */ if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook_loaded.Notebook event has already happened diff --git a/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js b/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js index 4e8cb05..3bfe6a0 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js @@ -43,11 +43,13 @@ define([ var initialize = function () { update_params(); - Jupyter.toolbar.add_buttons_group([{ - label : 'Create/Edit Gist of Notebook', - icon : 'fa-github', - callback: show_gist_editor_modal - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Create/Edit Gist of Notebook', + icon : 'fa-github', + handler: show_gist_editor_modal + }) + ]); }; // update params with any specified in the server's config file diff --git a/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js b/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js index 807b804..ff6cc9a 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js @@ -53,16 +53,17 @@ define([ var initialize = function () { update_params(); if (params.help_panel_add_toolbar_button) { - IPython.toolbar.add_buttons_group([{ - id : 'btn_help_panel', - label : 'Show help panel', - icon : 'fa-book', - callback : function() { - var visible = toggleHelpPanel(); - var btn = $(this); - setTimeout(function() { btn.blur(); }, 500); - } - }]); + IPython.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Show help panel', + icon : 'fa-book', + handler: function() { + var visible = toggleHelpPanel(); + var btn = $(this); + setTimeout(function() { btn.blur(); }, 500); + } + }, 'btn_help_panel') + ]); $('#btn_help_panel').attr({ 'data-toggle': 'button', 'aria-pressed': 'false' diff --git a/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js b/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js index c4ad0e7..cf2d860 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js @@ -30,15 +30,16 @@ define([ var load_ipython_extension = function() { // Add a button to the toolbar - Jupyter.toolbar.add_buttons_group([{ - id: 'btn-hide-input', - label: 'Toggle selected cell input display', - icon: 'fa-chevron-up', - callback: function() { - toggle_selected_input(); - setTimeout(function() { $('#btn-hide-input').blur(); }, 500); - } - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Toggle selected cell input display', + icon : 'fa-chevron-up', + handler: function() { + toggle_selected_input(); + setTimeout(function() { $('#btn-hide-input').blur(); }, 500); + } + }, 'btn-hide-input') + ]); // Collapse all cells that are marked as hidden if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook already loaded. Update directly diff --git a/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js b/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js index 3e797e4..217c9f5 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js @@ -36,15 +36,16 @@ define([ } var load_ipython_extension = function() { - Jupyter.toolbar.add_buttons_group([{ - id : 'toggle_codecells', - label : 'Hide codecell inputs', - icon : 'fa-eye', - callback : function() { - toggle(); - setTimeout(function() { $('#toggle_codecells').blur(); }, 500); - } - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Hide codecell inputs', + icon : 'fa-eye', + handler: function() { + toggle(); + setTimeout(function() { $('#toggle_codecells').blur(); }, 500); + } + }, 'toggle_codecells') + ]); if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook_loaded.Notebook event has already happened initialize(); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js b/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js index f4f0786..7a1c04f 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js @@ -59,17 +59,18 @@ define(function(require, exports, module) { function showToolbar() { if ($('#showToolbar').length == 0) { - Jupyter.toolbar.add_buttons_group([{ - 'label': 'Translate current cell', - 'icon': 'fa-language', - 'callback': translateCurrentCell, - 'id': 'showToolbar' - }, - { - 'label': 'nbTranslate: Configuration (toggle toolbar)', - 'icon': 'fa-wrench', - 'callback': translateToolbarToggle //translateToolbar - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + 'help' : 'Translate current cell', + 'icon' : 'fa-language', + 'handler': translateCurrentCell, + }, 'showToolbar'), + Jupyter.actions.register ({ + 'help' : 'nbTranslate: Configuration (toggle toolbar)', + 'icon' : 'fa-wrench', + 'handler': translateToolbarToggle //translateToolbar + }) + ]); } } diff --git a/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js b/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js index c153682..86b8f93 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js @@ -65,12 +65,11 @@ define([ var add_permissions_button = function () { if ($("#permissions-button").length === 0) { Jupyter.toolbar.add_buttons_group([ - { - 'label' : 'Grant Notification Permissions', - 'icon' : 'fa-check', - 'callback': ask_permission, - 'id' : 'permissions-button' - }, + Jupyter.actions.register ({ + 'help' : 'Grant Notification Permissions', + 'icon' : 'fa-check', + 'handler': ask_permission, + },'permissions-button') ]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js b/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js index 02811de..e49e975 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js @@ -60,12 +60,11 @@ define([ var load_ipython_extension = function() { IPython.toolbar.add_buttons_group([ - { - id: 'doPrintView', - label: 'Create static print view', - icon: 'fa-print', - callback: nbconvertPrintView - } + Jupyter.actions.register ({ + help : 'Create static print view', + icon : 'fa-print', + handler: nbconvertPrintView + }, 'doPrintView') ]); return IPython.notebook.config.loaded.then(initialize); }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js b/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js index a5ba3c4..be5492a 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js @@ -9,14 +9,13 @@ define([ /** * Button to launch QTConsole */ - { - 'id' : 'qtconsole', - 'label' : 'Run QTConsole', - 'icon' : 'fa-terminal', - 'callback': function () { + Jupyter.actions.register ({ + 'help' : 'Run QTConsole', + 'icon' : 'fa-terminal', + 'handler': function () { Jupyter.notebook.kernel.execute('%qtconsole') } - } + }, 'qtconsole') ]); }; return { diff --git a/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js b/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js index 9dd8b3c..3ab32ad 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js @@ -29,12 +29,11 @@ define([ function load_extension() { Jupyter.toolbar.add_buttons_group([ - { - id: 'toggle_scroll_down', - label: 'toggle automatic scrolling down', - icon: 'fa-angle-double-down ', - callback: toggleScrollDown - } + Jupyter.actions.register ({ + help : 'toggle automatic scrolling down', + icon : 'fa-angle-double-down ', + handler: toggleScrollDown + }, 'toggle_scroll_down') ]); console.log("[ScrollDown] is loaded"); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/search-replace/main.js b/src/jupyter_contrib_nbextensions/nbextensions/search-replace/main.js index 1f7a9b5..e76e8dc 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/search-replace/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/search-replace/main.js @@ -147,15 +147,14 @@ define([ }; IPython.toolbar.add_buttons_group([ - { - id : 'toggle_searchbar', - label : 'Toggle Search Toolbar', - icon : 'fa-search', - callback : function () { + Jupyter.actions.register ({ + help : 'Toggle Search Toolbar', + icon : 'fa-search', + handler: function () { toggle_toolbar(); $('#searchbar_search_text') } - } + }, 'toggle_searchbar') ]); $("#toggle_searchbar").css({'outline' : 'none'}); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js index 1e8a6c4..483fb78 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js @@ -148,17 +148,18 @@ define([ * Add a button to the jupyter toolbar for toggling spellcheck overlay */ function add_toolbar_buttons () { - return Jupyter.toolbar.add_buttons_group([{ - label : 'Toggle spell checking on markdown cells', - icon : 'fa-check', - callback : function (evt) { + return Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + help : 'Toggle spell checking on markdown cells', + icon : 'fa-check', + handler: function (evt) { toggle_spellcheck(); setTimeout(function () { evt.currentTarget.blur(); }, 100); - }, - id : 'spellchecker_btn' - }]); + } + }, 'spellchecker_btn') + ]); } /** diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js index 07f8ad6..a96a62d 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js @@ -126,12 +126,13 @@ define([ return; } if ($("#toc_button").length === 0) { - IPython.toolbar.add_buttons_group([{ - 'label': 'Table of Contents', - 'icon': 'fa-list', - 'callback': toggleToc, - 'id': 'toc_button' - }]); + IPython.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + 'help' : 'Table of Contents', + 'icon' : 'fa-list', + 'handler': toggleToc, + }, 'toc_button') + ]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js b/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js index c440c10..de5c73d 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js @@ -100,12 +100,13 @@ define([ return; } if ($("#varInspector_button").length === 0) { - Jupyter.toolbar.add_buttons_group([{ - 'label': 'Variable Inspector', - 'icon': 'fa-crosshairs', - 'callback': toggleVarInspector, - 'id': 'varInspector_button' - }]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + 'help' : 'Variable Inspector', + 'icon' : 'fa-crosshairs', + 'handler': toggleVarInspector, + }, 'varInspector_button') + ]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js b/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js index aa23b3a..96bfec3 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js @@ -161,17 +161,17 @@ define([ }; var load_ipython_extension = function(background) { - IPython.toolbar.add_buttons_group([{ - 'label' : 'Enter/Exit Zenmode', + IPython.toolbar.add_buttons_group([ + Jupyter.actions.register ({ + 'help' : 'Enter/Exit Zenmode', 'icon' : 'fa-empire', - 'callback': function() { + 'handler': function() { toggleZenMode(background); setTimeout(function () { $('#zenmode-toggle-btn').blur(); }, 500); }, - 'id' : 'zenmode-toggle-btn' - }], + }, 'zenmode-toggle-btn')], 'zenmode-btn-grp' ); $("#maintoolbar-container").prepend($('#zenmode-btn-grp')); From 8cc9d795d088e36b18abb11b80aad6a1b0ad3efd Mon Sep 17 00:00:00 2001 From: Josh Barnes Date: Thu, 12 Oct 2017 15:10:57 +0100 Subject: [PATCH 3/3] [various] ensure actions have names and prefixes, and buttons keep correct ids --- .../nbextensions/addbefore/main.js | 8 +- .../code_font_size/code_font_size.js | 8 +- .../nbextensions/collapsible_headings/main.js | 73 +++++++++---------- .../nbextensions/datestamper/main.js | 9 ++- .../nbextensions/equation-numbering/main.js | 13 ++-- .../nbextensions/exercise/main.js | 9 ++- .../nbextensions/exercise2/main.js | 9 ++- .../nbextensions/export_embedded/main.js | 19 ++--- .../nbextensions/freeze/main.js | 21 ++++-- .../nbextensions/gist_it/main.js | 6 +- .../nbextensions/help_panel/help_panel.js | 9 ++- .../nbextensions/hide_header/main.js | 2 +- .../nbextensions/hide_input/main.js | 9 ++- .../nbextensions/hide_input_all/main.js | 9 ++- .../nbextensions/nbTranslate/main.js | 25 ++++--- .../nbextensions/notify/notify.js | 9 ++- .../nbextensions/printview/main.js | 9 ++- .../nbextensions/qtconsole/qtconsole.js | 9 ++- .../nbextensions/runtools/main.js | 9 ++- .../nbextensions/scroll_down/main.js | 9 ++- .../nbextensions/spellchecker/main.js | 25 ++++--- .../nbextensions/toc2/main.js | 9 ++- .../nbextensions/varInspector/main.js | 9 ++- .../nbextensions/zenmode/main.js | 12 +-- 24 files changed, 176 insertions(+), 153 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js b/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js index d864de9..3367bd9 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js @@ -9,7 +9,7 @@ define([ var load_extension = function() { Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.keyboard_manager.actions.register ({ 'help' : 'Insert Cell Above', 'icon' : 'fa-arrow-circle-o-up', 'handler': function () { @@ -17,8 +17,8 @@ define([ Jupyter.notebook.select_prev(); Jupyter.notebook.focus_cell(); } - }), - Jupyter.actions.register ({ + }, 'insert-cell-above', 'addbefore'), + Jupyter.keyboard_manager.actions.register ({ 'help' : 'Insert Cell Below', 'icon' : 'fa-arrow-circle-o-down', 'handler': function () { @@ -26,7 +26,7 @@ define([ Jupyter.notebook.select_next(); Jupyter.notebook.focus_cell(); } - }) + }, 'insert-cell-below', 'addbefore'), ]); $('#insert_above_below').remove() diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js b/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js index cf2384e..7fec848 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.js @@ -47,20 +47,20 @@ define([ /* * Buttons to increase/decrease code font size */ - Jupyter.actions.register ({ + Jupyter.keyboard_manager.actions.register ({ 'help' : 'Increase code font size', 'icon' : 'fa-search-plus', 'handler': function () { $( document ).ready(code_change_fontsize(true)); } - }), - Jupyter.actions.register ({ + }, 'increase-code-font-size', 'code_font_size'), + Jupyter.keyboard_manager.actions.register ({ 'help' : 'Decrease code font size', 'icon' : 'fa-search-minus', 'handler': function () { $( document ).ready(code_change_fontsize(false)); } - }) + }, 'decrease-code-font-size', 'code_font_size'), ]); }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js index 595c8ef..51a9041 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js @@ -736,6 +736,39 @@ 'uncollapse_all_headings', mod_name ); + action_names.toggle = Jupyter.keyboard_manager.actions.register ({ + handler: function () { + var heading_cell = find_header_cell(Jupyter.notebook.get_selected_cell(), function (cell) { + return cell.element.is(':visible') && !_is_collapsed(cell); + }); + if (is_heading(heading_cell)) { + toggle_heading(heading_cell, true); + Jupyter.notebook.select(Jupyter.notebook.find_cell_index(heading_cell)); + } + }, + help : "Toggle closest heading's collapsed status", + icon : 'fa-angle-double-up', + }, + 'toggle_collapse_heading', mod_name + ); + + action_names.toggle_all = Jupyter.keyboard_manager.actions.register ({ + handler: function () { + var cells = Jupyter.notebook.get_cells(); + for (var ii = 0; ii < cells.length; ii++) { + if (is_heading(cells[ii])) { + Jupyter.keyboard_manager.actions.call(action_names[ + is_collapsed_heading(cells[ii]) ? 'uncollapse_all' : 'collapse_all']); + return; + } + } + }, + help : 'Collapse/uncollapse all headings based on the status of the first', + icon : 'fa-angle-double-up', + }, + 'toggle_collapse_all_headings', mod_name + ); + action_names.select = Jupyter.keyboard_manager.actions.register({ handler : function (env) { var cell = env.notebook.get_selected_cell(); @@ -834,46 +867,10 @@ function add_buttons_and_shortcuts () { // (Maybe) add buttons to the toolbar if (params.add_button) { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - help : 'toggle heading', - icon : 'fa-angle-double-up', - handler: function () { - /** - * Collapse the closest uncollapsed heading above the - * currently selected cell. - */ - var heading_cell = find_header_cell(Jupyter.notebook.get_selected_cell(), function (cell) { - return cell.element.is(':visible') && !_is_collapsed(cell); - }); - if (is_heading(heading_cell)) { - toggle_heading(heading_cell, true); - Jupyter.notebook.select(Jupyter.notebook.find_cell_index(heading_cell)); - } - } - }) - ]); + Jupyter.toolbar.add_buttons_group([action_names.toggle]); } if (params.add_all_cells_button) { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - help : 'toggle all headings', - icon : 'fa-angle-double-up', - handler: function () { - /** - * Collapse/uncollapse all heading cells based on status of first - */ - var cells = Jupyter.notebook.get_cells(); - for (var ii = 0; ii < cells.length; ii++) { - if (is_heading(cells[ii])) { - Jupyter.keyboard_manager.actions.call(action_names[ - is_collapsed_heading(cells[ii]) ? 'uncollapse_all' : 'collapse_all']); - return; - } - } - } - }) - ]); + Jupyter.toolbar.add_buttons_group([action_names.toggle_all]); } if (params.add_insert_header_buttons) { Jupyter.toolbar.add_buttons_group([ diff --git a/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js b/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js index 7869d76..c884cf7 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js @@ -26,13 +26,14 @@ define([ }; var load_ipython_extension = function () { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'datestamp', + action: IPython.keyboard_manager.actions.register ({ help : 'insert datestamp', icon : 'fa-calendar', handler: datestamp - }, 'datestamp') - ]); + }, 'insert-datestamp', 'datestamp') + }]); }; var extension = { diff --git a/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js b/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js index 90cc2d6..92211f0 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js @@ -7,12 +7,15 @@ define([ 'require', 'notebook/js/textcell', 'base/js/utils', -], function(IPython, $, require, textcell, utils) { +], function(Jupyter, $, require, textcell, utils) { "use strict"; + var MathJax = window.MathJax; + var load_ipython_extension = function() { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'reset_numbering', + action: Jupyter.keyboard_manager.actions.register ({ help : 'Reset equation numbering', icon : 'fa-sort-numeric-asc', handler: function () { @@ -23,8 +26,8 @@ define([ ); $('#reset_numbering').blur(); } - }, 'reset_numbering') - ]); + }, 'reset-numbering', 'equation_numbering') + }]); MathJax.Hub.Config({ TeX: { equationNumbers: { autoNumber: "AMS" } } }); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js index dae4a82..c06e492 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js @@ -131,16 +131,17 @@ define([ } function load_ipython_extension(){ - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'hide_solutions', + action: IPython.keyboard_manager.actions.register ({ help : 'Exercise: Create/Remove solutions', icon : 'fa-mortar-board', handler : function () { //console.log(IPython.notebook.get_selected_cells()) hide_solutions(); } - }, 'hide_solutions') - ]); + }, 'hide_solutions', 'exercise') + }]); /** * load css file and append to document diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js index 41bc295..0a3eda7 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js @@ -127,15 +127,16 @@ id=\"myCheck' + cbx + '\" >\ } function load_ipython_extension(){ - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'process_solution', + action: IPython.keyboard_manager.actions.register ({ help : 'Exercise2: Create/Remove solution', icon : 'fa-toggle-on', handler : function () { process_solution(); } - }, 'process_solution') - ]); + }, 'process_solution', 'exercise2') + }]); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js b/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js index 3a44a54..279afe0 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js @@ -33,15 +33,16 @@ define([ /* Add also a Button, currently disabled */ /* - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - help : 'Embedded HTML Export', - icon : 'fa-save', - handler: function() { - Jupyter.menubar._nbconvert('html_embed', true); - } - }, 'export_embeddedhtml') - ]); + Jupyter.toolbar.add_buttons_group([{ + id: 'export_embeddedhtml', + action: Jupyter.keyboard_manager.actions.register ({ + help : 'Embedded HTML Export', + icon : 'fa-save', + handler: function() { + Jupyter.menubar._nbconvert('html_embed', true); + } + }, 'export-embedded-html', 'export_embedded') + }]); */ if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook_loaded.Notebook event has already happened diff --git a/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js b/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js index 95f9e3c..7efebe6 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js @@ -160,23 +160,28 @@ define([ } function load_extension () { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'make_normal', + action: Jupyter.keyboard_manager.actions.register ({ help : 'lift restrictions from selected cells', icon : 'fa-unlock-alt', handler : make_normal_selected - },'make_normal'), - Jupyter.actions.register({ + }, 'make-cells-normal', mod_name) + }, { + id: 'make_read_only', + action: Jupyter.keyboard_manager.actions.register({ help : 'make selected cells read-only', icon: 'fa-lock', handler : make_read_only_selected - },'make_read_only'), - Jupyter.actions.register({ + }, 'make-cells-read-only', mod_name), + }, { + id: 'freeze_cells', + action: Jupyter.keyboard_manager.actions.register({ help : 'freeze selected cells', icon : 'fa-asterisk', handler : make_frozen_selected - },'freeze_cells') - ]); + }, 'freeze-cells', mod_name) + }]); patch_CodeCell_execute(); patch_MarkdownCell_unrender(); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js b/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js index 3bfe6a0..6cecb9e 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/gist_it/main.js @@ -44,11 +44,11 @@ define([ var initialize = function () { update_params(); Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - help : 'Create/Edit Gist of Notebook', + Jupyter.keyboard_manager.actions.register ({ + help : 'Create/Edit Gist of Notebook', icon : 'fa-github', handler: show_gist_editor_modal - }) + }, 'create-gist-from-notebook', 'gist_it') ]); }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js b/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js index ff6cc9a..c091d23 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js @@ -53,8 +53,9 @@ define([ var initialize = function () { update_params(); if (params.help_panel_add_toolbar_button) { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'btn_help_panel', + action: IPython.keyboard_manager.actions.register({ help : 'Show help panel', icon : 'fa-book', handler: function() { @@ -62,8 +63,8 @@ define([ var btn = $(this); setTimeout(function() { btn.blur(); }, 500); } - }, 'btn_help_panel') - ]); + }, 'show-help-panel', 'help_panel'), + }]); $('#btn_help_panel').attr({ 'data-toggle': 'button', 'aria-pressed': 'false' diff --git a/src/jupyter_contrib_nbextensions/nbextensions/hide_header/main.js b/src/jupyter_contrib_nbextensions/nbextensions/hide_header/main.js index d9db225..998ae61 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/hide_header/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/hide_header/main.js @@ -44,7 +44,7 @@ define([ var prefix = 'hide_header'; var action_name = 'toggle'; - var full_action_name = Jupyter.actions.register(action, action_name, prefix); + var full_action_name = Jupyter.keyboard_manager.actions.register(action, action_name, prefix); // define keyboard shortcuts var shortcuts = {}; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js b/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js index cf2d860..dabe19a 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/hide_input/main.js @@ -30,16 +30,17 @@ define([ var load_ipython_extension = function() { // Add a button to the toolbar - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'btn-hide-input', + action: Jupyter.keyboard_manager.actions.register ({ help : 'Toggle selected cell input display', icon : 'fa-chevron-up', handler: function() { toggle_selected_input(); setTimeout(function() { $('#btn-hide-input').blur(); }, 500); } - }, 'btn-hide-input') - ]); + }, 'toggle-cell-input-display', 'hide_input') + }]); // Collapse all cells that are marked as hidden if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook already loaded. Update directly diff --git a/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js b/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js index 217c9f5..b0abeda 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/hide_input_all/main.js @@ -36,16 +36,17 @@ define([ } var load_ipython_extension = function() { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'toggle_codecells', + action: Jupyter.keyboard_manager.actions.register ({ help : 'Hide codecell inputs', icon : 'fa-eye', handler: function() { toggle(); setTimeout(function() { $('#toggle_codecells').blur(); }, 500); } - }, 'toggle_codecells') - ]); + }, 'hide-codecell-inputs', 'hide_input_all'), + }]); if (Jupyter.notebook !== undefined && Jupyter.notebook._fully_loaded) { // notebook_loaded.Notebook event has already happened initialize(); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js b/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js index 7a1c04f..44de751 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js @@ -60,17 +60,20 @@ define(function(require, exports, module) { function showToolbar() { if ($('#showToolbar').length == 0) { Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - 'help' : 'Translate current cell', - 'icon' : 'fa-language', - 'handler': translateCurrentCell, - }, 'showToolbar'), - Jupyter.actions.register ({ - 'help' : 'nbTranslate: Configuration (toggle toolbar)', - 'icon' : 'fa-wrench', - 'handler': translateToolbarToggle //translateToolbar - }) - ]); + { + id: 'showToolbar', + action: Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Translate current cell', + 'icon' : 'fa-language', + 'handler': translateCurrentCell, + }, 'translate-cell', 'nbTranslate'), + }, + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'nbTranslate: Configuration (toggle toolbar)', + 'icon' : 'fa-wrench', + 'handler': translateToolbarToggle //translateToolbar + }, 'show-nbTranslate-toolbar', 'nbTranslate'), + ]); } } diff --git a/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js b/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js index 86b8f93..383ba3c 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js @@ -64,13 +64,14 @@ define([ var add_permissions_button = function () { if ($("#permissions-button").length === 0) { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'permissions-button', + action: Jupyter.keyboard_manager.actions.register ({ 'help' : 'Grant Notification Permissions', 'icon' : 'fa-check', 'handler': ask_permission, - },'permissions-button') - ]); + },'grant-notifications-permission', 'notify') + }]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js b/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js index e49e975..092170a 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/printview/main.js @@ -59,13 +59,14 @@ define([ }; var load_ipython_extension = function() { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'doPrintView', + action: IPython.keyboard_manager.actions.register ({ help : 'Create static print view', icon : 'fa-print', handler: nbconvertPrintView - }, 'doPrintView') - ]); + }, 'create-static-printview', 'printview'), + }]); return IPython.notebook.config.loaded.then(initialize); }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js b/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js index be5492a..96fa48d 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/qtconsole/qtconsole.js @@ -5,18 +5,19 @@ define([ 'base/js/events' ], function(Jupyter, events) { var load_ipython_extension = function () { - Jupyter.toolbar.add_buttons_group([ + Jupyter.toolbar.add_buttons_group([{ /** * Button to launch QTConsole */ - Jupyter.actions.register ({ + id: 'qtconsole', + action: Jupyter.keyboard_manager.actions.register ({ 'help' : 'Run QTConsole', 'icon' : 'fa-terminal', 'handler': function () { Jupyter.notebook.kernel.execute('%qtconsole') } - }, 'qtconsole') - ]); + }, 'run-qtconsole', 'qtconsole') + }]); }; return { load_ipython_extension : load_ipython_extension diff --git a/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js b/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js index c021ee5..977f884 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js @@ -77,13 +77,14 @@ define([ add_gutter_events(); /* Add run control buttons to toolbar */ - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'toggle_runtools', + action: Jupyter.keyboard_manager.actions.register ({ help: 'Toggle Runtools Toolbar', icon: 'fa-cogs', handler: toggle_toolbar - }, 'toggle_runtools') - ]); + }, 'toggle-runtools-toolbar', 'runtools') + }]); $("#toggle_runtools").css({ 'outline': 'none' }); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js b/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js index 3ab32ad..ed3be74 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/scroll_down/main.js @@ -28,13 +28,14 @@ define([ } function load_extension() { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'toggle_scroll_down', + action: Jupyter.keyboard_manager.actions.register({ help : 'toggle automatic scrolling down', icon : 'fa-angle-double-down ', handler: toggleScrollDown - }, 'toggle_scroll_down') - ]); + }, 'toggle-auto-scroll-down', 'scroll_down') + }]); console.log("[ScrollDown] is loaded"); diff --git a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js index 483fb78..f6081f9 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js @@ -148,18 +148,19 @@ define([ * Add a button to the jupyter toolbar for toggling spellcheck overlay */ function add_toolbar_buttons () { - return Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - help : 'Toggle spell checking on markdown cells', - icon : 'fa-check', - handler: function (evt) { - toggle_spellcheck(); - setTimeout(function () { - evt.currentTarget.blur(); - }, 100); - } - }, 'spellchecker_btn') - ]); + return Jupyter.toolbar.add_buttons_group([{ + id: 'spellchecker_btn', + action: Jupyter.keyboard_manager.actions.register ({ + help : 'Toggle spell checking on markdown cells', + icon : 'fa-check', + handler: function (evt) { + toggle_spellcheck(); + setTimeout(function () { + evt.currentTarget.blur(); + }, 100); + } + }, 'toggle-spellchecking', 'spellchecker') + }]); } /** diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js index 8891fe3..8aaba80 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js @@ -125,13 +125,14 @@ define([ return; } if ($("#toc_button").length === 0) { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + IPython.toolbar.add_buttons_group([{ + id: 'toc_button', + action: Jupyter.keyboard_manager.actions.register ({ 'help' : 'Table of Contents', 'icon' : 'fa-list', 'handler': toggleToc, - }, 'toc_button') - ]); + }, 'toggle-toc', 'toc2') + }]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js b/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js index de5c73d..23df7e0 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js @@ -100,13 +100,14 @@ define([ return; } if ($("#varInspector_button").length === 0) { - Jupyter.toolbar.add_buttons_group([ - Jupyter.actions.register ({ + Jupyter.toolbar.add_buttons_group([{ + id: 'varInspector_button', + action: Jupyter.keyboard_manager.actions.register ({ 'help' : 'Variable Inspector', 'icon' : 'fa-crosshairs', 'handler': toggleVarInspector, - }, 'varInspector_button') - ]); + }, 'toggle-variable-inspector', 'varInspector') + }]); } }; diff --git a/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js b/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js index 96bfec3..41a732c 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js @@ -161,9 +161,10 @@ define([ }; var load_ipython_extension = function(background) { - IPython.toolbar.add_buttons_group([ - Jupyter.actions.register ({ - 'help' : 'Enter/Exit Zenmode', + IPython.toolbar.add_buttons_group([{ + id: 'zenmode-toggle-btn', + action: IPython.keyboard_manager.actions.register({ + 'help' : 'Enter/Exit Zenmode', 'icon' : 'fa-empire', 'handler': function() { toggleZenMode(background); @@ -171,9 +172,8 @@ define([ $('#zenmode-toggle-btn').blur(); }, 500); }, - }, 'zenmode-toggle-btn')], - 'zenmode-btn-grp' - ); + }, 'toggle-zenmode', 'zenmode'), + }], 'zenmode-btn-grp'); $("#maintoolbar-container").prepend($('#zenmode-btn-grp')); return IPython.notebook.config.loaded.then(initialize); };