From 98b9fe778686c317f6c4169a80c4b094e9c04a1d 2015-01-14 18:25:14
From: Min RK <benjaminrk@gmail.com>
Date: 2015-01-14 18:25:14
Subject: [PATCH] Merge pull request #7416 from Carreau/jump7367

Prevent jump when clicking on action in menu.
---

diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index d82200e..5683c0d 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -60,7 +60,10 @@ define([
             ks = this.kernelspecs[keys[i]];
             ks_submenu_entry = $("<li>").attr("id", "kernel-submenu-"+ks.name).append($('<a>')
                 .attr('href', '#')
-                .click($.proxy(this.set_kernel, this, ks.name))
+                .click(function(){
+                        $.proxy(this.set_kernel, this, ks.name)
+                        event.preventDefault();
+                    })
                 .text(ks.spec.display_name));
             change_kernel_submenu.append(ks_submenu_entry);
         }
@@ -70,7 +73,10 @@ define([
             ks = this.kernelspecs[keys[i]];
             ks_submenu_entry = $("<li>").attr("id", "new-notebook-submenu-"+ks.name).append($('<a>')
                 .attr('href', '#')
-                .click($.proxy(this.new_notebook, this, ks.name))
+                .click(function(){
+                        $.proxy(this.new_notebook, this, ks.name)
+                        event.preventDefault();
+                    })
                 .text(ks.spec.display_name));
             new_notebook_submenu.append(ks_submenu_entry);
         }
diff --git a/IPython/html/static/notebook/js/menubar.js b/IPython/html/static/notebook/js/menubar.js
index 82def62..f91435e 100644
--- a/IPython/html/static/notebook/js/menubar.js
+++ b/IPython/html/static/notebook/js/menubar.js
@@ -62,6 +62,7 @@ define([
                 // re-select it upon selection.
                 var i = that.notebook.get_selected_index();
                 that.notebook.select(i);
+                event.preventDefault();
             }
         );
     };
@@ -102,6 +103,10 @@ define([
         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();
@@ -116,38 +121,50 @@ define([
             
             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) {
@@ -159,7 +176,9 @@ define([
                     .removeClass("disabled")
                     .find("a").text("Trust Notebook");
             }
+            if(event)event.preventDefault();
         });
+
         this.element.find('#kill_and_exit').click(function () {
             var close_window = function () {
                 /**
@@ -170,149 +189,189 @@ define([
             };
             // 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 () {
             $('div#header-container').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();
         });
     };
 
@@ -341,6 +400,7 @@ define([
                     .text(moment(d).format("LLLL"))
                     .click(function () {
                         that.notebook.restore_checkpoint_dialog(checkpoint);
+                        if(event)event.preventDefault();
                     })
                 )
             );