From 0a702ff7182d3e7a63827570edf7a3a143195c8c Mon Sep 17 00:00:00 2001 From: Nile Geisinger Date: Mon, 14 Apr 2014 11:56:46 -0400 Subject: [PATCH] Fixing bug #5607 Changed the method from extends to merge which merges the two arrays as desired - With Freyert --- IPython/html/static/notebook/js/quickhelp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 08b01d518..76c4ae438 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -135,7 +135,7 @@ var IPython = (function (IPython) { QuickHelp.prototype.build_edit_help = function (cm_shortcuts) { var edit_shortcuts = IPython.keyboard_manager.edit_shortcuts.help(); - jQuery.extend(cm_shortcuts, edit_shortcuts); + jQuery.merge(cm_shortcuts, edit_shortcuts); return build_div('

Edit Mode (press Enter to enable)

', cm_shortcuts); };