Merge branch 'master' of https://github.com/Sukneet/jupyter_contrib_nbextensions into Sukneet-master

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.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()
 

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));
                      }
-                }
+                })
 
             ]);
         };

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([

src/jupyter_contrib_nbextensions/nbextensions/datestamper/main.js

@@ -27,17 +27,16 @@ 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')
         ]);
     };
 
     var extension = {
         load_ipython_extension : load_ipython_extension,
     };
     return extension;
-});
+});

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

@@ -12,19 +12,18 @@ 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],
                         ["Reprocess", MathJax.Hub]
                     );
                     $('#reset_numbering').blur();
                 }
-            }
+            }, 'reset_numbering')
         ]);
         MathJax.Hub.Config({
           TeX: { equationNumbers: { autoNumber: "AMS" } }

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')
          ]);
 
      /**

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')
          ]);
 
 

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

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();

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