Merge pull request #6227 from Carreau/cellt-g-event

Use global event for celltoolbar

IPython/html/static/notebook/js/celltoolbar.js

@@ -4,7 +4,8 b''
 define([
     'base/js/namespace',
     'jquery',
-], function(IPython, $) {
+    'base/js/events'
+], function(IPython, $, events) {
     "use strict";
 
     var CellToolbar = function (options) {
@@ -18,7 +19,6 b' define(['
         //          notebook: Notebook instance 
         CellToolbar._instances.push(this);
         this.notebook = options.notebook;
-        this.events = options.events;
         this.cell = options.cell;
         this.create_element();
         this.rebuild();
@@ -175,13 +175,14 b' define(['
      *      CellToolbar.register_preset('foo.foo_preset1', ['foo.c1', 'foo.c2', 'foo.c5'])
      *      CellToolbar.register_preset('foo.foo_preset2', ['foo.c4', 'foo.c5'])
      */
-    CellToolbar.register_preset = function(name, preset_list, notebook, events) {
+    CellToolbar.register_preset = function(name, preset_list, notebook) {
         CellToolbar._presets[name] = preset_list;
         events.trigger('preset_added.CellToolbar', {name: name});
         // When "register_callback" is called by a custom extension, it may be executed after notebook is loaded.
         // In that case, activate the preset if needed.
-        if (notebook && notebook.metadata && notebook.metadata.celltoolbar === name)
-            CellToolbar.activate_preset(name, events);
+        if (notebook && notebook.metadata && notebook.metadata.celltoolbar === name){
+            CellToolbar.activate_preset(name);
+        }
     };
 
 
@@ -214,7 +215,7 b' define(['
      *
      *      CellToolbar.activate_preset('foo.foo_preset1');
      */
-    CellToolbar.activate_preset = function(preset_name, events){
+    CellToolbar.activate_preset = function(preset_name){
         var preset = CellToolbar._presets[preset_name];
 
         if(preset !== undefined){
@@ -222,9 +223,7 b' define(['
             CellToolbar.rebuild_all();
         }
 
-        if (events) {
-            events.trigger('preset_activated.CellToolbar', {name: preset_name});
-        }
+        events.trigger('preset_activated.CellToolbar', {name: preset_name});
     };
 
 

IPython/html/static/notebook/js/celltoolbarpresets/default.js

@@ -34,7 +34,7 b' define(['
         button_container.append(button);
     };
 
-    var register = function (notebook, events) {
+    var register = function (notebook) {
         CellToolbar.register_callback('default.rawedit', add_raw_edit_button);
         raw_edit = $.proxy(raw_edit, {
             notebook: notebook,
@@ -44,7 +44,7 b' define(['
         var example_preset = [];
         example_preset.push('default.rawedit');
 
-        CellToolbar.register_preset('Edit Metadata', example_preset, notebook, events);
+        CellToolbar.register_preset('Edit Metadata', example_preset, notebook);
         console.log('Default extension for cell metadata editing loaded.');
     };
     return {'register': register};

IPython/html/static/notebook/js/celltoolbarpresets/example.js

@@ -137,11 +137,11 b' define(['
         button_container.append(button);
     };
 
-    var register = function (notebook, events) {
+    var register = function (notebook) {
         CellToolbar.register_callback('example.help',add_simple_dialog_button);
         example_preset.push('example.help');
 
-        CellToolbar.register_preset('Example',example_preset, notebook, events);
+        CellToolbar.register_preset('Example',example_preset, notebook);
         console.log('Example extension for metadata editing loaded.');
     };
     return {'register': register};

IPython/html/static/notebook/js/celltoolbarpresets/rawcell.js

@@ -74,11 +74,11 b' define(['
       "Raw NBConvert Format"
   );
 
-  var register = function (notebook, events) {
+  var register = function (notebook) {
     CellToolbar.register_callback('raw_cell.select', select_type, ['raw']);
     raw_cell_preset.push('raw_cell.select');
 
-    CellToolbar.register_preset('Raw Cell Format', raw_cell_preset, notebook, events);
+    CellToolbar.register_preset('Raw Cell Format', raw_cell_preset, notebook);
     console.log('Raw Cell Format toolbar preset loaded.');
   };
   return {'register': register};

IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js

@@ -35,11 +35,11 b' define(['
                 },
             "Slide Type");
 
-    var register = function (notebook, events) {
+    var register = function (notebook) {
         CellToolbar.register_callback('slideshow.select',select_type);
         slideshow_preset.push('slideshow.select');
 
-        CellToolbar.register_preset('Slideshow',slideshow_preset, notebook, events);
+        CellToolbar.register_preset('Slideshow',slideshow_preset, notebook);
         console.log('Slideshow extension for metadata editing loaded.');
     };
     return {'register': register};

IPython/html/static/notebook/js/codecell.js

@@ -131,7 +131,6 b' define(['
         var inner_cell = $('<div/>').addClass('inner_cell');
         this.celltoolbar = new celltoolbar.CellToolbar({
             cell: this, 
-            events: this.events, 
             notebook: this.notebook});
         inner_cell.append(this.celltoolbar.element);
         var input_area = $('<div/>').addClass('input_area');

IPython/html/static/notebook/js/notebook.js

@@ -130,9 +130,9 b' define(['
         };
 
         // Trigger cell toolbar registration.
-        default_celltoolbar.register(this, options.events);
-        rawcell_celltoolbar.register(this, options.events);
-        slideshow_celltoolbar.register(this, options.events);
+        default_celltoolbar.register(this);
+        rawcell_celltoolbar.register(this);
+        slideshow_celltoolbar.register(this);
     };
 
     /**
@@ -2274,7 +2274,7 b' define(['
         // load toolbar state
         if (this.metadata.celltoolbar) {
             celltoolbar.CellToolbar.global_show();
-            celltoolbar.CellToolbar.activate_preset(this.metadata.celltoolbar, this.events);
+            celltoolbar.CellToolbar.activate_preset(this.metadata.celltoolbar);
         } else {
             celltoolbar.CellToolbar.global_hide();
         }

IPython/html/static/notebook/js/textcell.js

@@ -78,7 +78,6 b' define(['
         var inner_cell = $('<div/>').addClass('inner_cell');
         this.celltoolbar = new celltoolbar.CellToolbar({
             cell: this, 
-            events: this.events, 
             notebook: this.notebook});
         inner_cell.append(this.celltoolbar.element);
         var input_area = $('<div/>').addClass('input_area');