Merge pull request #2745 from gnestor/keymap-default

Make "extraKeys" consistent for notebook and editor
jupyter · Sep 20, 2017 · 11ba6be · 11ba6be
2 parents 39c27ac + f222978
commit 11ba6be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/notebook/static/edit/js/editor.js b/notebook/static/edit/js/editor.js
@@ -76,12 +76,18 @@ function(
     // default CodeMirror options
     Editor.default_codemirror_options = {
         extraKeys: {
-            "Tab" :  "indentMore",
+            "Cmd-Right": "goLineRight",
+            "End": "goLineRight",
+            "Cmd-Left": "goLineLeft",
+            "Tab": "indentMore",
+            "Shift-Tab" : "indentLess",
+            "Cmd-/" : "toggleComment",
+            "Ctrl-/" : "toggleComment",
         },
         indentUnit: 4,
         theme: "ipython",
         lineNumbers: true,
-        lineWrapping: true,
+        lineWrapping: true
     };
 
     Editor.prototype.load = function() {
@@ -170,7 +176,7 @@ function(
             Editor: {
                 file_extension_modes: update_mode_map,
             }
-        })
+        });
     };
 
     Editor.prototype.get_filename = function () {

diff --git a/notebook/static/edit/js/menubar.js b/notebook/static/edit/js/menubar.js
@@ -125,7 +125,7 @@ define([
         });
 
         this.events.on("config_changed.Editor", function () {
-            var keyMap = editor.codemirror.getOption('keyMap') || "default";
+            var keyMap = editor.codemirror.getOption('keyMap') || 'default';
             that.element.find(".selected-keymap").removeClass("selected-keymap");
             that.element.find("#menu-keymap-" + keyMap).addClass("selected-keymap");
         });

diff --git a/notebook/static/notebook/js/cell.js b/notebook/static/notebook/js/cell.js
@@ -134,8 +134,6 @@ define([
                 "Cmd-Left": "goLineLeft",
                 "Tab": "indentMore",
                 "Shift-Tab" : "indentLess",
-                // "Cmd-Alt-[" : "indentAuto",
-                // "Ctrl-Alt-[" : "indentAuto",
                 "Cmd-/" : "toggleComment",
                 "Ctrl-/" : "toggleComment",
             }