remove superfluous event.preventDefault

from  #7416

only one of the additions from that PR was necessary to address the issue

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

@@ -1,233 +1,231 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 define([
     'jquery',
     'base/js/namespace',
     'base/js/dialog',
     'base/js/utils',
 ], function($, IPython, dialog, utils) {
     "use strict";
     
     var KernelSelector = function(selector, notebook) {
         var that = this;
         this.selector = selector;
         this.notebook = notebook;
         this.notebook.set_kernelselector(this);
         this.events = notebook.events;
         this.current_selection = null;
         this.kernelspecs = {};
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.request_kernelspecs();
         }
         this.bind_events();
         // Make the object globally available for user convenience & inspection
         IPython.kernelselector = this;
         this._finish_load = null;
         this.loaded = new Promise(function(resolve, reject) {
             that._finish_load = resolve;
         });
         
         Object.seal(this);
     };
     
     KernelSelector.prototype.request_kernelspecs = function() {
         var url = utils.url_join_encode(this.notebook.base_url, 'api/kernelspecs');
         utils.promising_ajax(url).then($.proxy(this._got_kernelspecs, this));
     };
     
     KernelSelector.prototype._got_kernelspecs = function(data) {
         var that = this;
         this.kernelspecs = data.kernelspecs;
         var change_kernel_submenu = $("#menu-change-kernel-submenu");
         var new_notebook_submenu = $("#menu-new-notebook-submenu");
         
         var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
             // sort by display_name
             var da = data.kernelspecs[a].spec.display_name;
             var db = data.kernelspecs[b].spec.display_name;
             if (da === db) {
                 return 0;
             } else if (da > db) {
                 return 1;
             } else {
                 return -1;
             }
         });
         
         keys.map(function (key) {
             // Create the Kernel > Change kernel submenu
             var ks = data.kernelspecs[key];
             change_kernel_submenu.append(
                 $("<li>").attr("id", "kernel-submenu-"+ks.name).append(
                     $('<a>')
                         .attr('href', '#')
                         .click( function () {
                             that.set_kernel(ks.name);
-                            event.preventDefault();
                         })
                         .text(ks.spec.display_name)
                 )
             );
             // Create the File > New Notebook submenu
             new_notebook_submenu.append(
                 $("<li>").attr("id", "new-notebook-submenu-"+ks.name).append(
                     $('<a>')
                         .attr('href', '#')
                         .click( function () {
                             that.new_notebook(ks.name);
-                            event.preventDefault();
                         })
                         .text(ks.spec.display_name)
                 )
             );
 
         });
         // trigger loaded promise
         this._finish_load();
     };
     
     KernelSelector.prototype._spec_changed = function (event, ks) {
         /** event handler for spec_changed */
         
         // update selection
         this.current_selection = ks.name;
         
         // put the current kernel at the top of File > New Notebook
         var cur_kernel_entry = $("#new-notebook-submenu-" + ks.name);
         var parent = cur_kernel_entry.parent();
         // do something only if there is more than one kernel
         if (parent.children().length > 1) {
             // first, sort back the submenu
             parent.append(
                 parent.children("li[class!='divider']").sort(
                     function (a,b) {
                         var da = $("a",a).text();
                         var db = $("a",b).text();
                         if (da === db) {
                             return 0;
                         } else if (da > db) {
                             return 1;
                         } else {
                             return -1;
                         }}));
             // then, if there is no divider yet, add one
             if (!parent.children("li[class='divider']").length) {
                 parent.prepend($("<li>").attr("class","divider"));
             } 
             // finally, put the current kernel at the top
             parent.prepend(cur_kernel_entry);
         }
         
         // load logo
         var logo_img = this.element.find("img.current_kernel_logo");
         $("#kernel_indicator").find('.kernel_indicator_name').text(ks.spec.display_name);
         if (ks.resources['logo-64x64']) {
             logo_img.attr("src", ks.resources['logo-64x64']);
             logo_img.show();
         } else {
             logo_img.hide();
         }
         
         // load kernel css
         var css_url = ks.resources['kernel.css'];
         if (css_url) {
             $('#kernel-css').attr('href', css_url);
         } else {
             $('#kernel-css').attr('href', '');
         }
         
         // load kernel js
         if (ks.resources['kernel.js']) {
             require([ks.resources['kernel.js']],
                 function (kernel_mod) {
                     if (kernel_mod && kernel_mod.onload) {
                         kernel_mod.onload();
                     } else {
                         console.warn("Kernel " + ks.name + " has a kernel.js file that does not contain "+
                                      "any asynchronous module definition. This is undefined behavior "+
                                      "and not recommended.");
                     }
                 }, function (err) {
                     console.warn("Failed to load kernel.js from ", ks.resources['kernel.js'], err);
                 }
             );
         }
     };
 
     KernelSelector.prototype.set_kernel = function (kernel_name) {
         /** set the kernel by name, ensuring kernelspecs have been loaded, first */
         var that = this;
         return this.loaded.then(function () {
             that._set_kernel(kernel_name);
         });
     };
 
     KernelSelector.prototype._set_kernel = function (kernel_name) {
         /** Actually set the kernel (kernelspecs have been loaded) */
         if (kernel_name === this.current_selection) {
             // only trigger event if value changed
             return;
         }
         var ks = this.kernelspecs[kernel_name];
         if (this.notebook._session_starting) {
             console.error("Cannot change kernel while waiting for pending session start.");
             return;
         }
         this.current_selection = kernel_name;
         this.events.trigger('spec_changed.Kernel', ks);
     };
 
     KernelSelector.prototype.new_notebook = function (kernel_name) {
         
         var w = window.open();
         // Create a new notebook in the same path as the current
         // notebook's path.
         var that = this;
         var parent = utils.url_path_split(that.notebook.notebook_path)[0];
         that.notebook.contents.new_untitled(parent, {type: "notebook"}).then(
             function (data) {
                 var url = utils.url_join_encode(
                     that.notebook.base_url, 'notebooks', data.path
                 );
                 url += "?kernel_name=" + kernel_name;
                 w.location = url;
             },
             function(error) {
                 w.close();
                 dialog.modal({
                     title : 'Creating Notebook Failed',
                     body : "The error was: " + error.message,
                     buttons : {'OK' : {'class' : 'btn-primary'}}
                 });
             }
         );
     };
 
     KernelSelector.prototype.lock_switch = function() {
         // should set a flag and display warning+reload if user want to
         // re-change kernel. As UI discussion never finish
         // making that a separate PR.
         console.warn('switching kernel is not guaranteed to work !');
     };
 
     KernelSelector.prototype.bind_events = function() {
         var that = this;
         this.events.on('spec_changed.Kernel', $.proxy(this._spec_changed, this));
 
         this.events.on('kernel_created.Session', function (event, data) {
             that.set_kernel(data.kernel.name);
         });
         
         var logo_img = this.element.find("img.current_kernel_logo");
         logo_img.on("load", function() {
             logo_img.show();
         });
         logo_img.on("error", function() {
             logo_img.hide();
         });
     };
 
     return {'KernelSelector': KernelSelector};
 });

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

@@ -1,467 +1,413 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 define([
     'jquery',
     'base/js/namespace',
     'base/js/dialog',
     'base/js/utils',
     'notebook/js/tour',
     'bootstrap',
     'moment',
 ], function($, IPython, dialog, utils, tour, bootstrap, moment) {
     "use strict";
     
     var MenuBar = function (selector, options) {
         /**
          * Constructor
          *
          * A MenuBar Class to generate the menubar of IPython notebook
          *
          * Parameters:
          *  selector: string
          *  options: dictionary
          *      Dictionary of keyword arguments.
          *          notebook: Notebook instance
          *          contents: ContentManager instance
          *          events: $(Events) instance
          *          save_widget: SaveWidget instance
          *          quick_help: QuickHelp instance
          *          base_url : string
          *          notebook_path : string
          *          notebook_name : string
          */
         options = options || {};
         this.base_url = options.base_url || utils.get_body_data("baseUrl");
         this.selector = selector;
         this.notebook = options.notebook;
         this.contents = options.contents;
         this.events = options.events;
         this.save_widget = options.save_widget;
         this.quick_help = options.quick_help;
 
         try {
             this.tour = new tour.Tour(this.notebook, this.events);
         } catch (e) {
             this.tour = undefined;
             console.log("Failed to instantiate Notebook Tour", e);
         }
 
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
             this.bind_events();
         }
     };
 
     // TODO: This has definitively nothing to do with style ...
     MenuBar.prototype.style = function () {
         var that = this;
         this.element.find("li").click(function (event, ui) {
                 // The selected cell loses focus when the menu is entered, so we
                 // re-select it upon selection.
                 var i = that.notebook.get_selected_index();
                 that.notebook.select(i);
                 event.preventDefault();
             }
         );
     };
 
     MenuBar.prototype._nbconvert = function (format, download) {
         download = download || false;
         var notebook_path = this.notebook.notebook_path;
         var url = utils.url_join_encode(
             this.base_url,
             'nbconvert',
             format,
             notebook_path
         ) + "?download=" + download.toString();
         
         var w = window.open();
         if (this.notebook.dirty) {
             this.notebook.save_notebook().then(function() {
                 w.location = url;
             });
         } else {
             w.location = url;
         }
     };
 
     MenuBar.prototype._size_header = function() {
         /** 
          * Update header spacer size.
          */
         this.events.trigger('resize-header.Page');
     };
 
     MenuBar.prototype.bind_events = function () {
         /**
          *  File
          */
         var that = this;
         
         this.element.find('#open_notebook').click(function () {
             var parent = utils.url_path_split(that.notebook.notebook_path)[0];
             window.open(utils.url_join_encode(that.base_url, 'tree', parent));
-            // all if(event) are here to let test pass
-            // as evnet might not be devined when clicking with
-            // casper.js
-            if(event)event.preventDefault();
         });
         this.element.find('#copy_notebook').click(function () {
             that.notebook.copy_notebook();
             return false;
         });
         this.element.find('#download_ipynb').click(function () {
             var base_url = that.notebook.base_url;
             var notebook_path = that.notebook.notebook_path;
             if (that.notebook.dirty) {
                 that.notebook.save_notebook({async : false});
             }
             
             var url = utils.url_join_encode(base_url, 'files', notebook_path);
             window.open(url + '?download=1');
-            if(event)event.preventDefault();
         });
         
         this.element.find('#print_preview').click(function () {
             that._nbconvert('html', false);
-            if(event)event.preventDefault();
         });
 
         this.element.find('#download_html').click(function () {
             that._nbconvert('html', true);
-            if(event)event.preventDefault();
         });
 
         this.element.find('#download_rst').click(function () {
             that._nbconvert('rst', true);
-            if(event)event.preventDefault();
         });
 
         this.element.find('#download_pdf').click(function () {
             that._nbconvert('pdf', true);
-            if(event)event.preventDefault();
         });
 
         this.element.find('#download_script').click(function () {
             that._nbconvert('script', true);
-            if(event)event.preventDefault();
         });
 
         this.element.find('#rename_notebook').click(function () {
             that.save_widget.rename_notebook({notebook: that.notebook});
-            if(event)event.preventDefault();
         });
 
         this.element.find('#save_checkpoint').click(function () {
             that.notebook.save_checkpoint();
-            if(event)event.preventDefault();
         });
 
         this.element.find('#restore_checkpoint').click(function () {
         });
 
         this.element.find('#trust_notebook').click(function () {
             that.notebook.trust_notebook();
-            if(event)event.preventDefault();
         });
         this.events.on('trust_changed.Notebook', function (event, trusted) {
             if (trusted) {
                 that.element.find('#trust_notebook')
                     .addClass("disabled").off('click')
                     .find("a").text("Trusted Notebook");
             } else {
                 that.element.find('#trust_notebook')
                     .removeClass("disabled").on('click', function () {
                         that.notebook.trust_notebook();
                     })
                     .find("a").text("Trust Notebook");
             }
-            if(event)event.preventDefault();
         });
 
         this.element.find('#kill_and_exit').click(function () {
             var close_window = function () {
                 /**
                  * allow closing of new tabs in Chromium, impossible in FF
                  */
                 window.open('', '_self', '');
                 window.close();
             };
             // finish with close on success or failure
             that.notebook.session.delete(close_window, close_window);
-            if(event)event.preventDefault();
         });
 
         // Edit
         this.element.find('#cut_cell').click(function () {
             that.notebook.cut_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#copy_cell').click(function () {
             that.notebook.copy_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#delete_cell').click(function () {
             that.notebook.delete_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#undelete_cell').click(function () {
             that.notebook.undelete_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#split_cell').click(function () {
             that.notebook.split_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#merge_cell_above').click(function () {
             that.notebook.merge_cell_above();
-            if(event)event.preventDefault();
         });
         this.element.find('#merge_cell_below').click(function () {
             that.notebook.merge_cell_below();
-            if(event)event.preventDefault();
         });
         this.element.find('#move_cell_up').click(function () {
             that.notebook.move_cell_up();
-            if(event)event.preventDefault();
         });
         this.element.find('#move_cell_down').click(function () {
             that.notebook.move_cell_down();
-            if(event)event.preventDefault();
         });
         this.element.find('#edit_nb_metadata').click(function () {
             that.notebook.edit_metadata({
                 notebook: that.notebook,
                 keyboard_manager: that.notebook.keyboard_manager});
-            if(event)event.preventDefault();
         });
         
         // View
         this.element.find('#toggle_header').click(function () {
             $('#header-container').toggle();
             $('.header-bar').toggle();
             that._size_header();
-            if(event)event.preventDefault();
         });
         this.element.find('#toggle_toolbar').click(function () {
             $('div#maintoolbar').toggle();
             that._size_header();
-            if(event)event.preventDefault();
         });
         // Insert
         this.element.find('#insert_cell_above').click(function () {
             that.notebook.insert_cell_above('code');
             that.notebook.select_prev();
-            if(event)event.preventDefault();
         });
         this.element.find('#insert_cell_below').click(function () {
             that.notebook.insert_cell_below('code');
             that.notebook.select_next();
-            if(event)event.preventDefault();
         });
         // Cell
         this.element.find('#run_cell').click(function () {
             that.notebook.execute_cell();
-            if(event)event.preventDefault();
         });
         this.element.find('#run_cell_select_below').click(function () {
             that.notebook.execute_cell_and_select_below();
-            if(event)event.preventDefault();
         });
         this.element.find('#run_cell_insert_below').click(function () {
             that.notebook.execute_cell_and_insert_below();
-            if(event)event.preventDefault();
         });
         this.element.find('#run_all_cells').click(function () {
             that.notebook.execute_all_cells();
-            if(event)event.preventDefault();
         });
         this.element.find('#run_all_cells_above').click(function () {
             that.notebook.execute_cells_above();
-            if(event)event.preventDefault();
         });
         this.element.find('#run_all_cells_below').click(function () {
             that.notebook.execute_cells_below();
-            if(event)event.preventDefault();
         });
         this.element.find('#to_code').click(function () {
             that.notebook.to_code();
-            if(event)event.preventDefault();
         });
         this.element.find('#to_markdown').click(function () {
             that.notebook.to_markdown();
-            if(event)event.preventDefault();
         });
         this.element.find('#to_raw').click(function () {
             that.notebook.to_raw();
-            if(event)event.preventDefault();
         });
         
         this.element.find('#toggle_current_output').click(function () {
             that.notebook.toggle_output();
-            if(event)event.preventDefault();
         });
         this.element.find('#toggle_current_output_scroll').click(function () {
             that.notebook.toggle_output_scroll();
-            if(event)event.preventDefault();
         });
         this.element.find('#clear_current_output').click(function () {
             that.notebook.clear_output();
-            if(event)event.preventDefault();
         });
         
         this.element.find('#toggle_all_output').click(function () {
             that.notebook.toggle_all_output();
-            if(event)event.preventDefault();
         });
         this.element.find('#toggle_all_output_scroll').click(function () {
             that.notebook.toggle_all_output_scroll();
-            if(event)event.preventDefault();
         });
         this.element.find('#clear_all_output').click(function () {
             that.notebook.clear_all_output();
-            if(event)event.preventDefault();
         });
         
         // Kernel
         this.element.find('#int_kernel').click(function () {
             that.notebook.kernel.interrupt();
-            if(event)event.preventDefault();
         });
         this.element.find('#restart_kernel').click(function () {
             that.notebook.restart_kernel();
-            if(event)event.preventDefault();
         });
         this.element.find('#reconnect_kernel').click(function () {
             that.notebook.kernel.reconnect();
-            if(event)event.preventDefault();
         });
         // Help
         if (this.tour) {
             this.element.find('#notebook_tour').click(function () {
                 that.tour.start();
-                if(event)event.preventDefault();
             });
         } else {
             this.element.find('#notebook_tour').addClass("disabled");
         }
         this.element.find('#keyboard_shortcuts').click(function () {
             that.quick_help.show_keyboard_shortcuts();
-            if(event)event.preventDefault();
         });
         
         this.update_restore_checkpoint(null);
         
         this.events.on('checkpoints_listed.Notebook', function (event, data) {
             that.update_restore_checkpoint(that.notebook.checkpoints);
-            if(event)event.preventDefault();
         });
         
         this.events.on('checkpoint_created.Notebook', function (event, data) {
             that.update_restore_checkpoint(that.notebook.checkpoints);
-            if(event)event.preventDefault();
         });
         
         this.events.on('notebook_loaded.Notebook', function() {
             var langinfo = that.notebook.metadata.language_info || {};
             that.update_nbconvert_script(langinfo);
-            if(event)event.preventDefault();
         });
         
         this.events.on('kernel_ready.Kernel', function(event, data) {
             var langinfo = data.kernel.info_reply.language_info || {};
             that.update_nbconvert_script(langinfo);
             that.add_kernel_help_links(data.kernel.info_reply.help_links || []);
-            if(event)event.preventDefault();
         });
     };
 
     MenuBar.prototype.update_restore_checkpoint = function(checkpoints) {
         var ul = this.element.find("#restore_checkpoint").find("ul");
         ul.empty();
         if (!checkpoints || checkpoints.length === 0) {
             ul.append(
                 $("<li/>")
                 .addClass("disabled")
                 .append(
                     $("<a/>")
                     .text("No checkpoints")
                 )
             );
             return;
         }
         
         var that = this;
         checkpoints.map(function (checkpoint) {
             var d = new Date(checkpoint.last_modified);
             ul.append(
                 $("<li/>").append(
                     $("<a/>")
                     .attr("href", "#")
                     .text(moment(d).format("LLLL"))
                     .click(function () {
                         that.notebook.restore_checkpoint_dialog(checkpoint);
-                        if(event)event.preventDefault();
                     })
                 )
             );
         });
     };
     
     MenuBar.prototype.update_nbconvert_script = function(langinfo) {
         /**
          * Set the 'Download as foo' menu option for the relevant language.
          */
         var el = this.element.find('#download_script');
         
         // Set menu entry text to e.g. "Python (.py)"
         var langname = (langinfo.name || 'Script');
         langname = langname.charAt(0).toUpperCase()+langname.substr(1); // Capitalise
         el.find('a').text(langname + ' ('+(langinfo.file_extension || 'txt')+')');
     };
 
     MenuBar.prototype.add_kernel_help_links = function(help_links) {
         /** add links from kernel_info to the help menu */
         var divider = $("#kernel-help-links");
         if (divider.length === 0) {
             // insert kernel help section above about link
             var about = $("#notebook_about").parent();
             divider = $("<li>")
                 .attr('id', "kernel-help-links")
                 .addClass('divider');
             about.prev().before(divider);
         }
         // remove previous entries
         while (!divider.next().hasClass('divider')) {
             divider.next().remove();
         }
         if (help_links.length === 0) {
             // no help links, remove the divider
             divider.remove();
             return;
         }
         var cursor = divider;
         help_links.map(function (link) {
             cursor.after($("<li>")
                 .append($("<a>")
                     .attr('target', '_blank')
                     .attr('title', 'Opens in a new window')
                     .attr('href', link.url)
                     .text(link.text)
                     .append($("<i>")
                         .addClass("fa fa-external-link menu-icon pull-right")
                     )
                 )
             );
             cursor = cursor.next();
         });
         
     };
 
     // Backwards compatability.
     IPython.MenuBar = MenuBar;
 
     return {'MenuBar': MenuBar};
 });