diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index fb1f451..c960310 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -67,35 +67,7 @@ var IPython = (function (IPython) { QuickHelp.prototype.build_command_help = function () { var command_shortcuts = IPython.keyboard_manager.command_shortcuts.help(); - var help, shortcut; - var i, half, n; - - // Command mode - var cmd_div = $('
').append($('

Command Mode (press Esc to enable)

')); - var cmd_sub_div = $('
').addClass('hbox'); - var cmd_col1 = $('
').addClass('box-flex0'); - var cmd_col2 = $('
').addClass('box-flex0'); - n = command_shortcuts.length; - half = ~~(n/2); // Truncate :) - for (i=0; i').addClass('quickhelp'). - append($('').addClass('shortcut_key').text(shortcut)). - append($('').addClass('shortcut_descr').text(' : ' + help)) - ); - }; - for (i=half; i').addClass('quickhelp'). - append($('').addClass('shortcut_key').text(shortcut)). - append($('').addClass('shortcut_descr').text(' : ' + help)) - ); - }; - cmd_sub_div.append(cmd_col1).append(cmd_col2); - cmd_div.append(cmd_sub_div); - return cmd_div; + return build_div('

Command Mode (press Esc to enable)

', command_shortcuts); } var special_case = { pageup: "PageUp", pagedown: "Page Down" }; @@ -104,8 +76,12 @@ var IPython = (function (IPython) { var k, i; for (i in keys) { k = keys[i]; - if ( k.length == 1 ) continue; // leave individual keys lower-cased + if ( k.length == 1 ) { + keys[i] = "" + k + ""; + continue; // leave individual keys lower-cased + } keys[i] = ( special_case[k] ? special_case[k] : k.charAt(0).toUpperCase() + k.slice(1) ); + keys[i] = "" + keys[i] + ""; } return keys.join('-'); @@ -114,35 +90,32 @@ var IPython = (function (IPython) { QuickHelp.prototype.build_edit_help = function () { var edit_shortcuts = IPython.keyboard_manager.edit_shortcuts.help(); - var help, shortcut; - var i, half, n; - // Edit mode - var edit_div = $('
').append($('

Edit Mode (press Enter to enable)

')); - var edit_sub_div = $('
').addClass('hbox'); - var edit_col1 = $('
').addClass('box-flex0'); - var edit_col2 = $('
').addClass('box-flex0'); - n = edit_shortcuts.length; + return build_div('

Edit Mode (press Enter to enable)

', edit_shortcuts); + } + + var build_one = function (s) { + var help = s['help']; + var shortcut = prettify(s['shortcut']); + return $('
').addClass('quickhelp'). + append($('').addClass('shortcut_key').append($(shortcut))). + append($('').addClass('shortcut_descr').text(' : ' + help)) + + } + + var build_div = function (title, shortcuts) { + var i, half, n; + var div = $('
').append($(title)); + var sub_div = $('
').addClass('hbox'); + var col1 = $('
').addClass('box-flex0'); + var col2 = $('
').addClass('box-flex0'); + n = shortcuts.length; half = ~~(n/2); // Truncate :) - for (i=0; i').addClass('quickhelp'). - append($('').addClass('shortcut_key').text(shortcut)). - append($('').addClass('shortcut_descr').text(' : ' + help)) - ); - }; - for (i=half; i').addClass('quickhelp'). - append($('').addClass('shortcut_key').text(shortcut)). - append($('').addClass('shortcut_descr').text(' : ' + help)) - ); - }; - edit_sub_div.append(edit_col1).append(edit_col2); - edit_div.append(edit_sub_div); - return edit_div; + for (i=0; i