From 531b373eb8776593edf103e1c31fdd90295cb373 Mon Sep 17 00:00:00 2001 From: Josh Barnes Date: Mon, 30 Nov 2015 01:05:44 +0000 Subject: [PATCH] fix bug in `notebook/js/quickhelp` whereby edit-mode shortcuts were duplicated on every rebuild --- notebook/static/notebook/js/quickhelp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notebook/static/notebook/js/quickhelp.js b/notebook/static/notebook/js/quickhelp.js index 6c49d8519..735358b50 100644 --- a/notebook/static/notebook/js/quickhelp.js +++ b/notebook/static/notebook/js/quickhelp.js @@ -257,8 +257,8 @@ define([ QuickHelp.prototype.build_edit_help = function (cm_shortcuts) { var edit_shortcuts = this.keyboard_manager.edit_shortcuts.help(); - jQuery.merge(cm_shortcuts, edit_shortcuts); - return build_div('

Edit Mode (press Enter to enable)

', cm_shortcuts); + edit_shortcuts = jQuery.merge(jQuery.merge([], cm_shortcuts), edit_shortcuts); + return build_div('

Edit Mode (press Enter to enable)

', edit_shortcuts); }; var build_one = function (s) {