From f1573bd266020bf59fad6c20830396b3fe0b901a Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Tue, 25 Mar 2014 18:19:06 -0700 Subject: [PATCH 1/8] CodeMirror shortcuts in QuickHelp Our users shouldn't need an internet connection to look at the code mirror shortcuts. This PR places the CM keyboard shortcuts that are currently documented on our website's rendered docs, and places them inside the keyboard shortcuts quickhelp. --- IPython/html/static/notebook/js/quickhelp.js | 40 +++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 8f2e8f727..2fad6d6b0 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -1,9 +1,5 @@ -//---------------------------------------------------------------------------- -// Copyright (C) 2008-2011 The IPython Development Team -// -// Distributed under the terms of the BSD License. The full license is in -// the file COPYING, distributed as part of this software. -//---------------------------------------------------------------------------- +// Copyright (c) IPython Development Team. +// Distributed under the terms of the Modified BSD License. //============================================================================ // QuickHelp button @@ -15,6 +11,34 @@ var IPython = (function (IPython) { var QuickHelp = function (selector) { }; + var cm_shortcuts = [ + { shortcut:"Insert", help:"toggle overwrite" }, + { shortcut:"Tab", help:"code completion" }, + { shortcut:"Shift-Tab", help:"help introspection" }, + { shortcut:"Cmd-]", help:"indent" }, + { shortcut:"Cmd-[", help:"dedent" }, + { shortcut:"Cmd-A", help:"select all" }, + { shortcut:"Cmd-D", help:"delete line" }, + { shortcut:"Cmd-Z", help:"undo" }, + { shortcut:"Cmd-Shift-Z", help:"redo" }, + { shortcut:"Cmd-Y", help:"redo" }, + { shortcut:"Cmd-Up", help:"go to cell start" }, + { shortcut:"Cmd-End", help:"go to cell start" }, + { shortcut:"PageUp", help:"go to cell start" }, + { shortcut:"---", help:"go to cell end" }, + { shortcut:"Cmd-Down", help:"go to cell end" }, + { shortcut:"PageDown", help:"go to cell end" }, + { shortcut:"Alt-Left", help:"go one word left" }, + { shortcut:"Alt-Right", help:"go one word right" }, + { shortcut:"Cmd-Left", help:"go to line start" }, + { shortcut:"Home", help:"go to line start" }, + { shortcut:"Cmd-Right", help:"go to line end" }, + { shortcut:"End", help:"go to line end" }, + { shortcut:"Alt-Backspace", help:"del word before" }, + + ] + + QuickHelp.prototype.show_keyboard_shortcuts = function () { // toggles display of keyboard shortcut dialog var that = this; @@ -54,6 +78,10 @@ var IPython = (function (IPython) { var edit_div = this.build_edit_help(); element.append(edit_div); + // CodeMirror shortcuts + var cm_div = build_div('', cm_shortcuts); + element.append(cm_div); + this.shortcut_dialog = IPython.dialog.modal({ title : "Keyboard shortcuts", body : element, From 1102095830dff36e09125536ad4be76ea23838b5 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 27 Mar 2014 15:24:43 -0700 Subject: [PATCH 2/8] Hi, I'm a Mac. And I'm a PC. --- IPython/html/static/notebook/js/quickhelp.js | 32 ++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 2fad6d6b0..75c5afcf3 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -8,34 +8,42 @@ var IPython = (function (IPython) { "use strict"; + var platform = IPython.utils.platform; + var QuickHelp = function (selector) { }; + var cmd_ctrl = 'Ctrl'; + + if (platform === 'MacOS') { + cmd_ctrl = 'Cmd'; + } var cm_shortcuts = [ { shortcut:"Insert", help:"toggle overwrite" }, { shortcut:"Tab", help:"code completion" }, { shortcut:"Shift-Tab", help:"help introspection" }, - { shortcut:"Cmd-]", help:"indent" }, - { shortcut:"Cmd-[", help:"dedent" }, - { shortcut:"Cmd-A", help:"select all" }, - { shortcut:"Cmd-D", help:"delete line" }, - { shortcut:"Cmd-Z", help:"undo" }, - { shortcut:"Cmd-Shift-Z", help:"redo" }, - { shortcut:"Cmd-Y", help:"redo" }, - { shortcut:"Cmd-Up", help:"go to cell start" }, - { shortcut:"Cmd-End", help:"go to cell start" }, + { shortcut: cmd_ctrl + "-]", help:"indent" }, + { shortcut: cmd_ctrl + "-[", help:"dedent" }, + { shortcut: cmd_ctrl + "-A", help:"select all" }, + { shortcut: cmd_ctrl + "-D", help:"delete line" }, + { shortcut: cmd_ctrl + "-Z", help:"undo" }, + { shortcut: cmd_ctrl + "-Shift-Z", help:"redo" }, + { shortcut: cmd_ctrl + "-Y", help:"redo" }, + { shortcut: cmd_ctrl + "-Up", help:"go to cell start" }, + { shortcut: cmd_ctrl + "-End", help:"go to cell start" }, { shortcut:"PageUp", help:"go to cell start" }, { shortcut:"---", help:"go to cell end" }, - { shortcut:"Cmd-Down", help:"go to cell end" }, + { shortcut: cmd_ctrl + "-Down", help:"go to cell end" }, { shortcut:"PageDown", help:"go to cell end" }, { shortcut:"Alt-Left", help:"go one word left" }, { shortcut:"Alt-Right", help:"go one word right" }, - { shortcut:"Cmd-Left", help:"go to line start" }, + { shortcut: cmd_ctrl + "-Left", help:"go to line start" }, { shortcut:"Home", help:"go to line start" }, - { shortcut:"Cmd-Right", help:"go to line end" }, + { shortcut: cmd_ctrl + "-Right", help:"go to line end" }, { shortcut:"End", help:"go to line end" }, { shortcut:"Alt-Backspace", help:"del word before" }, + ] From 40ca1218c7b734bbfb7ca6908889c47620ae05cc Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 27 Mar 2014 16:48:01 -0700 Subject: [PATCH 3/8] completed both sets of platform-specific shortcuts --- IPython/html/static/notebook/js/quickhelp.js | 79 +++++++++++++------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 75c5afcf3..4d9148d32 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -15,36 +15,61 @@ var IPython = (function (IPython) { var cmd_ctrl = 'Ctrl'; if (platform === 'MacOS') { + // Mac OS X specific cmd_ctrl = 'Cmd'; + var platform_specific = [ + { shortcut: "Cmd-Up", help:"go to cell start" }, + { shortcut: "Cmd-End", help:"go to cell start" }, + { shortcut: "PageUp", help:"go to cell start" }, + { shortcut: "Cmd-Down", help:"go to cell end" }, + { shortcut: "PageDown", help:"go to cell end" }, + { shortcut: "Alt-Left", help:"go one word left" }, + { shortcut: "Alt-Right", help:"go one word right" }, + { shortcut: "Cmd-Left", help:"go to line start" }, + { shortcut: "Home", help:"go to line start" }, + { shortcut: "Cmd-Right", help:"go to line end" }, + { shortcut:"End", help:"go to line end" }, + { shortcut:"Alt-Backspace", help:"del word before" }, + { shortcut:"Ctrl-Alt-Backspace", help:"del word after" }, + { shortcut:"Alt-Delete", help:"del word after" }, + ] + } else { + // PC specific + var platform_specific = [ + { shortcut: "Ctrl-Home", help:"go to cell start" }, + { shortcut: "Alt-Up", help:"go to cell start" }, + { shortcut: "PageUp", help:"go to cell start" }, + { shortcut: "Ctrl-End", help:"go to cell end" }, + { shortcut: "Ctrl-Down", help:"go to cell end" }, + { shortcut: "PageDown", help:"go to cell end" }, + { shortcut: "Ctrl-Left", help:"go one word left" }, + { shortcut: "Ctrl-Right", help:"go one word right" }, + { shortcut: "Alt-Right", help:"go to cell end" }, + { shortcut: "Alt-Left", help:"go to line start" }, + { shortcut: "Home", help:"go to line start" }, + { shortcut: "Alt-Right", help:"go to line end" }, + { shortcut: "End", help:"go to line end" }, + { shortcut: "Ctrl-Backspace", help:"del word before" }, + { shortcut: "Ctrl-Delete", help:"del word after" }, + ] } - var cm_shortcuts = [ - { shortcut:"Insert", help:"toggle overwrite" }, - { shortcut:"Tab", help:"code completion" }, - { shortcut:"Shift-Tab", help:"help introspection" }, - { shortcut: cmd_ctrl + "-]", help:"indent" }, - { shortcut: cmd_ctrl + "-[", help:"dedent" }, - { shortcut: cmd_ctrl + "-A", help:"select all" }, - { shortcut: cmd_ctrl + "-D", help:"delete line" }, - { shortcut: cmd_ctrl + "-Z", help:"undo" }, - { shortcut: cmd_ctrl + "-Shift-Z", help:"redo" }, - { shortcut: cmd_ctrl + "-Y", help:"redo" }, - { shortcut: cmd_ctrl + "-Up", help:"go to cell start" }, - { shortcut: cmd_ctrl + "-End", help:"go to cell start" }, - { shortcut:"PageUp", help:"go to cell start" }, - { shortcut:"---", help:"go to cell end" }, - { shortcut: cmd_ctrl + "-Down", help:"go to cell end" }, - { shortcut:"PageDown", help:"go to cell end" }, - { shortcut:"Alt-Left", help:"go one word left" }, - { shortcut:"Alt-Right", help:"go one word right" }, - { shortcut: cmd_ctrl + "-Left", help:"go to line start" }, - { shortcut:"Home", help:"go to line start" }, - { shortcut: cmd_ctrl + "-Right", help:"go to line end" }, - { shortcut:"End", help:"go to line end" }, - { shortcut:"Alt-Backspace", help:"del word before" }, - - - ] + var cm_shortcuts = [ + { shortcut:"Insert", help:"toggle overwrite" }, + { shortcut:"Tab", help:"code completion" }, + { shortcut:"Shift-Tab", help:"help introspection" }, + { shortcut: cmd_ctrl + "-]", help:"indent" }, + { shortcut: cmd_ctrl + "-[", help:"dedent" }, + { shortcut: cmd_ctrl + "-A", help:"select all" }, + { shortcut: cmd_ctrl + "-D", help:"delete line" }, + { shortcut: cmd_ctrl + "-Z", help:"undo" }, + { shortcut: cmd_ctrl + "-Shift-Z", help:"redo" }, + { shortcut: cmd_ctrl + "-Y", help:"redo" }, + ].concat( platform_specific ); + + + + QuickHelp.prototype.show_keyboard_shortcuts = function () { From 354ff54aa55ef1aba9d11dbb2e4220c847d3d5e9 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 27 Mar 2014 17:05:09 -0700 Subject: [PATCH 4/8] remove no-op placeholder edit mode "shortcuts" --- .../static/notebook/js/keyboardmanager.js | 42 ------------------- IPython/html/static/notebook/js/quickhelp.js | 32 +++++++------- 2 files changed, 15 insertions(+), 59 deletions(-) diff --git a/IPython/html/static/notebook/js/keyboardmanager.js b/IPython/html/static/notebook/js/keyboardmanager.js index 28e4e14a1..940db3f08 100644 --- a/IPython/html/static/notebook/js/keyboardmanager.js +++ b/IPython/html/static/notebook/js/keyboardmanager.js @@ -157,50 +157,8 @@ var IPython = (function (IPython) { return false; } }, - 'tab' : { - help : 'indent or complete', - help_index : 'ec', - }, - 'shift-tab' : { - help : 'tooltip', - help_index : 'ed', - }, }; - if (platform === 'MacOS') { - default_edit_shortcuts['cmd-/'] = - { - help : 'toggle comment', - help_index : 'ee' - }; - default_edit_shortcuts['cmd-]'] = - { - help : 'indent', - help_index : 'ef' - }; - default_edit_shortcuts['cmd-['] = - { - help : 'dedent', - help_index : 'eg' - }; - } else { - default_edit_shortcuts['ctrl-/'] = - { - help : 'toggle comment', - help_index : 'ee' - }; - default_edit_shortcuts['ctrl-]'] = - { - help : 'indent', - help_index : 'ef' - }; - default_edit_shortcuts['ctrl-['] = - { - help : 'dedent', - help_index : 'eg' - }; - } - // Command mode defaults var default_command_shortcuts = { diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 4d9148d32..fd43d6276 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -12,12 +12,14 @@ var IPython = (function (IPython) { var QuickHelp = function (selector) { }; + var cmd_ctrl = 'Ctrl'; + var platform_specific; if (platform === 'MacOS') { // Mac OS X specific cmd_ctrl = 'Cmd'; - var platform_specific = [ + platform_specific = [ { shortcut: "Cmd-Up", help:"go to cell start" }, { shortcut: "Cmd-End", help:"go to cell start" }, { shortcut: "PageUp", help:"go to cell start" }, @@ -29,13 +31,13 @@ var IPython = (function (IPython) { { shortcut: "Home", help:"go to line start" }, { shortcut: "Cmd-Right", help:"go to line end" }, { shortcut:"End", help:"go to line end" }, - { shortcut:"Alt-Backspace", help:"del word before" }, - { shortcut:"Ctrl-Alt-Backspace", help:"del word after" }, - { shortcut:"Alt-Delete", help:"del word after" }, - ] + { shortcut:"Alt-Backspace", help:"del word before" }, + { shortcut:"Ctrl-Alt-Backspace", help:"del word after" }, + { shortcut:"Alt-Delete", help:"del word after" }, + ]; } else { // PC specific - var platform_specific = [ + platform_specific = [ { shortcut: "Ctrl-Home", help:"go to cell start" }, { shortcut: "Alt-Up", help:"go to cell start" }, { shortcut: "PageUp", help:"go to cell start" }, @@ -51,13 +53,13 @@ var IPython = (function (IPython) { { shortcut: "End", help:"go to line end" }, { shortcut: "Ctrl-Backspace", help:"del word before" }, { shortcut: "Ctrl-Delete", help:"del word after" }, - ] + ]; } var cm_shortcuts = [ { shortcut:"Insert", help:"toggle overwrite" }, - { shortcut:"Tab", help:"code completion" }, - { shortcut:"Shift-Tab", help:"help introspection" }, + { shortcut:"Tab", help:"code completion or indent" }, + { shortcut:"Shift-Tab", help:"tooltip" }, { shortcut: cmd_ctrl + "-]", help:"indent" }, { shortcut: cmd_ctrl + "-[", help:"dedent" }, { shortcut: cmd_ctrl + "-A", help:"select all" }, @@ -108,13 +110,9 @@ var IPython = (function (IPython) { element.append(cmd_div); // Edit mode - var edit_div = this.build_edit_help(); + var edit_div = this.build_edit_help(cm_shortcuts); element.append(edit_div); - // CodeMirror shortcuts - var cm_div = build_div('', cm_shortcuts); - element.append(cm_div); - this.shortcut_dialog = IPython.dialog.modal({ title : "Keyboard shortcuts", body : element, @@ -151,10 +149,10 @@ var IPython = (function (IPython) { }; - QuickHelp.prototype.build_edit_help = function () { + QuickHelp.prototype.build_edit_help = function (cm_shortcuts) { var edit_shortcuts = IPython.keyboard_manager.edit_shortcuts.help(); - // Edit mode - return build_div('

Edit Mode (press Enter to enable)

', edit_shortcuts); + jQuery.extend(cm_shortcuts, edit_shortcuts); + return build_div('

Edit Mode (press Enter to enable)

', cm_shortcuts); }; var build_one = function (s) { From c24ca22955b60b1ba26a27472a0ec14b7de6ef0b Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 27 Mar 2014 17:20:06 -0700 Subject: [PATCH 5/8] lower-cased single letter keys in shortcuts --- IPython/html/static/notebook/js/quickhelp.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index fd43d6276..44abb2ee8 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -62,11 +62,11 @@ var IPython = (function (IPython) { { shortcut:"Shift-Tab", help:"tooltip" }, { shortcut: cmd_ctrl + "-]", help:"indent" }, { shortcut: cmd_ctrl + "-[", help:"dedent" }, - { shortcut: cmd_ctrl + "-A", help:"select all" }, - { shortcut: cmd_ctrl + "-D", help:"delete line" }, - { shortcut: cmd_ctrl + "-Z", help:"undo" }, - { shortcut: cmd_ctrl + "-Shift-Z", help:"redo" }, - { shortcut: cmd_ctrl + "-Y", help:"redo" }, + { shortcut: cmd_ctrl + "-a", help:"select all" }, + { shortcut: cmd_ctrl + "-d", help:"delete line" }, + { shortcut: cmd_ctrl + "-z", help:"undo" }, + { shortcut: cmd_ctrl + "-Shift-z", help:"redo" }, + { shortcut: cmd_ctrl + "-y", help:"redo" }, ].concat( platform_specific ); From c37e10feb2d0da1638eaa46e94dd5bfe8422a9f9 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Fri, 28 Mar 2014 12:58:25 -0700 Subject: [PATCH 6/8] move hyphen to cmd_ctrl --- IPython/html/static/notebook/js/quickhelp.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 44abb2ee8..13a8772f0 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -13,12 +13,12 @@ var IPython = (function (IPython) { var QuickHelp = function (selector) { }; - var cmd_ctrl = 'Ctrl'; + var cmd_ctrl = 'Ctrl-'; var platform_specific; if (platform === 'MacOS') { // Mac OS X specific - cmd_ctrl = 'Cmd'; + cmd_ctrl = 'Cmd-'; platform_specific = [ { shortcut: "Cmd-Up", help:"go to cell start" }, { shortcut: "Cmd-End", help:"go to cell start" }, @@ -60,13 +60,13 @@ var IPython = (function (IPython) { { shortcut:"Insert", help:"toggle overwrite" }, { shortcut:"Tab", help:"code completion or indent" }, { shortcut:"Shift-Tab", help:"tooltip" }, - { shortcut: cmd_ctrl + "-]", help:"indent" }, - { shortcut: cmd_ctrl + "-[", help:"dedent" }, - { shortcut: cmd_ctrl + "-a", help:"select all" }, - { shortcut: cmd_ctrl + "-d", help:"delete line" }, - { shortcut: cmd_ctrl + "-z", help:"undo" }, - { shortcut: cmd_ctrl + "-Shift-z", help:"redo" }, - { shortcut: cmd_ctrl + "-y", help:"redo" }, + { shortcut: cmd_ctrl + "]", help:"indent" }, + { shortcut: cmd_ctrl + "[", help:"dedent" }, + { shortcut: cmd_ctrl + "a", help:"select all" }, + { shortcut: cmd_ctrl + "d", help:"delete line" }, + { shortcut: cmd_ctrl + "z", help:"undo" }, + { shortcut: cmd_ctrl + "Shift-z", help:"redo" }, + { shortcut: cmd_ctrl + "y", help:"redo" }, ].concat( platform_specific ); From 7d4aed19e86836e4fd2d5c68c12562bb3bc596fb Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Fri, 28 Mar 2014 17:01:32 -0700 Subject: [PATCH 7/8] remove cm_keyboard.rst and OS-level shortcuts --- IPython/html/static/notebook/js/quickhelp.js | 23 ++++---------------- docs/source/notebook/notebook.rst | 4 ---- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index 13a8772f0..e28ccfee7 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -21,36 +21,22 @@ var IPython = (function (IPython) { cmd_ctrl = 'Cmd-'; platform_specific = [ { shortcut: "Cmd-Up", help:"go to cell start" }, - { shortcut: "Cmd-End", help:"go to cell start" }, - { shortcut: "PageUp", help:"go to cell start" }, { shortcut: "Cmd-Down", help:"go to cell end" }, - { shortcut: "PageDown", help:"go to cell end" }, - { shortcut: "Alt-Left", help:"go one word left" }, - { shortcut: "Alt-Right", help:"go one word right" }, - { shortcut: "Cmd-Left", help:"go to line start" }, - { shortcut: "Home", help:"go to line start" }, - { shortcut: "Cmd-Right", help:"go to line end" }, - { shortcut:"End", help:"go to line end" }, - { shortcut:"Alt-Backspace", help:"del word before" }, - { shortcut:"Ctrl-Alt-Backspace", help:"del word after" }, - { shortcut:"Alt-Delete", help:"del word after" }, + { shortcut: "Opt-Left", help:"go one word left" }, + { shortcut: "Opt-Right", help:"go one word right" }, + { shortcut: "Opt-Backspace", help:"del word before" }, + { shortcut: "Opt-Delete", help:"del word after" }, ]; } else { // PC specific platform_specific = [ { shortcut: "Ctrl-Home", help:"go to cell start" }, { shortcut: "Alt-Up", help:"go to cell start" }, - { shortcut: "PageUp", help:"go to cell start" }, { shortcut: "Ctrl-End", help:"go to cell end" }, { shortcut: "Ctrl-Down", help:"go to cell end" }, - { shortcut: "PageDown", help:"go to cell end" }, { shortcut: "Ctrl-Left", help:"go one word left" }, { shortcut: "Ctrl-Right", help:"go one word right" }, { shortcut: "Alt-Right", help:"go to cell end" }, - { shortcut: "Alt-Left", help:"go to line start" }, - { shortcut: "Home", help:"go to line start" }, - { shortcut: "Alt-Right", help:"go to line end" }, - { shortcut: "End", help:"go to line end" }, { shortcut: "Ctrl-Backspace", help:"del word before" }, { shortcut: "Ctrl-Delete", help:"del word after" }, ]; @@ -63,7 +49,6 @@ var IPython = (function (IPython) { { shortcut: cmd_ctrl + "]", help:"indent" }, { shortcut: cmd_ctrl + "[", help:"dedent" }, { shortcut: cmd_ctrl + "a", help:"select all" }, - { shortcut: cmd_ctrl + "d", help:"delete line" }, { shortcut: cmd_ctrl + "z", help:"undo" }, { shortcut: cmd_ctrl + "Shift-z", help:"redo" }, { shortcut: cmd_ctrl + "y", help:"redo" }, diff --git a/docs/source/notebook/notebook.rst b/docs/source/notebook/notebook.rst index c0a4880dd..98a930b4d 100644 --- a/docs/source/notebook/notebook.rst +++ b/docs/source/notebook/notebook.rst @@ -394,10 +394,6 @@ Ctrl-m . restart kernel Ctrl-m h show keyboard shortcuts ============ ========================== -.. seealso:: - - :ref:`Some additional Codemirror keyboard shortcuts ` - Plotting From 7880ad88b10c04ba424efc4ee45ae010e527fa71 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Fri, 28 Mar 2014 17:20:22 -0700 Subject: [PATCH 8/8] ok, removed last few unnecessary shortcuts --- IPython/html/static/notebook/js/quickhelp.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js index e28ccfee7..ae5384014 100644 --- a/IPython/html/static/notebook/js/quickhelp.js +++ b/IPython/html/static/notebook/js/quickhelp.js @@ -31,19 +31,17 @@ var IPython = (function (IPython) { // PC specific platform_specific = [ { shortcut: "Ctrl-Home", help:"go to cell start" }, - { shortcut: "Alt-Up", help:"go to cell start" }, + { shortcut: "Ctrl-Up", help:"go to cell start" }, { shortcut: "Ctrl-End", help:"go to cell end" }, { shortcut: "Ctrl-Down", help:"go to cell end" }, { shortcut: "Ctrl-Left", help:"go one word left" }, { shortcut: "Ctrl-Right", help:"go one word right" }, - { shortcut: "Alt-Right", help:"go to cell end" }, { shortcut: "Ctrl-Backspace", help:"del word before" }, { shortcut: "Ctrl-Delete", help:"del word after" }, ]; } var cm_shortcuts = [ - { shortcut:"Insert", help:"toggle overwrite" }, { shortcut:"Tab", help:"code completion or indent" }, { shortcut:"Shift-Tab", help:"tooltip" }, { shortcut: cmd_ctrl + "]", help:"indent" },