Merge pull request #1123 from jcb91/Sukneet-master

 [various] ensure actions have names and prefixes, and buttons keep correct ids

Author: jcb91

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.keyboard_manager.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 () {
+                 }, 'insert-cell-above', 'addbefore'),
+                 Jupyter.keyboard_manager.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-cell-below', 'addbefore'),
                  ]);
              $('#insert_above_below').remove()
 

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.keyboard_manager.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 () {
+                }, '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'),
 
             ]);
         };

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,42 +867,10 @@
 	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 () {
-					/**
-					 * 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([{
-				label: 'toggle all headings',
-				icon: 'fa-angle-double-up',
-				callback: 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([

src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js

@@ -26,18 +26,18 @@ define([
     };
 
     var load_ipython_extension = function () {
-        IPython.toolbar.add_buttons_group([
-            {
-                id : 'datestamp',
-                label : 'insert datestamp',
-                icon : 'fa-calendar',
-                callback : datestamp
-            }
-        ]);
+        IPython.toolbar.add_buttons_group([{
+            id: 'datestamp',
+            action: IPython.keyboard_manager.actions.register ({
+                help   : 'insert datestamp',
+                icon   : 'fa-calendar',
+                handler: datestamp
+            }, 'insert-datestamp', 'datestamp')
+        }]);
     };
 
     var extension = {
         load_ipython_extension : load_ipython_extension,
     };
     return extension;
-});
+});

src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js

@@ -7,25 +7,27 @@ 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([
-            {
-                id: 'reset_numbering',
-                label: 'Reset equation numbering',
-                icon: 'fa-sort-numeric-asc',
-                callback: function () {
+        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 () {
                     MathJax.Hub.Queue(
                         ["resetEquationNumbers", MathJax.InputJax.TeX],
                         ["PreProcess", MathJax.Hub],
                         ["Reprocess", MathJax.Hub]
                     );
                     $('#reset_numbering').blur();
                 }
-            }
-        ]);
+            }, 'reset-numbering', 'equation_numbering')
+        }]);
         MathJax.Hub.Config({
           TeX: { equationNumbers: { autoNumber: "AMS" } }
         });

src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js

@@ -131,17 +131,17 @@ define([
         }
 
 function load_ipython_extension(){
-    IPython.toolbar.add_buttons_group([
-            {
-                id : 'hide_solutions',
-                label : 'Exercise: Create/Remove solutions',
-                icon : 'fa-mortar-board',
-                callback : function () {
+    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', 'exercise')
+         }]);
 
      /**
      * load css file and append to document

src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js

@@ -127,16 +127,16 @@ 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 () {
+    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', 'exercise2')
+         }]);
 
 
 

src/jupyter_contrib_nbextensions/nbextensions/export_embedded/main.js

@@ -34,12 +34,14 @@ define([
         /* Add also a Button, currently disabled */
         /*
         Jupyter.toolbar.add_buttons_group([{
-            id : 'export_embeddedhtml',
-            label : 'Embedded HTML Export',
-            icon : 'fa-save',
-            callback : function() {
+            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) {

src/jupyter_contrib_nbextensions/nbextensions/freeze/main.js

@@ -160,26 +160,28 @@ define([
     }
 
     function load_extension () {
-        Jupyter.toolbar.add_buttons_group([
-            {
-                id : 'make_normal',
-                label : 'lift restrictions from selected cells',
+        Jupyter.toolbar.add_buttons_group([{
+            id: 'make_normal',
+            action: Jupyter.keyboard_manager.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-cells-normal', mod_name)
+        }, {
+            id: 'make_read_only',
+            action: Jupyter.keyboard_manager.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-cells-read-only', mod_name),
+        }, {
+            id: 'freeze_cells',
+            action: Jupyter.keyboard_manager.actions.register({
+                help : 'freeze selected cells',
                 icon : 'fa-asterisk',
-                callback : make_frozen_selected
-            }
-        ]);
+                handler : make_frozen_selected
+            }, 'freeze-cells', mod_name)
+        }]);
 
         patch_CodeCell_execute();
         patch_MarkdownCell_unrender();

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.keyboard_manager.actions.register ({
+                help   : 'Create/Edit Gist of Notebook',
+                icon   : 'fa-github',
+                handler: show_gist_editor_modal
+            }, 'create-gist-from-notebook', 'gist_it')
+        ]);
     };
 
     // update params with any specified in the server's config file