Merge "SideBySide2: Reclaim more browser keys from vim"
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
index e4ac7b1..9e5d30a 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java
@@ -91,10 +91,15 @@
// TODO: Better custom keybindings, remove temporary navigation hacks.
KeyMap km = CodeMirror.cloneKeyMap("vim");
for (String s : new String[] {
- "A", "C", "I", "O", "R", "U", "Ctrl-C", "Ctrl-O"}) {
+ "A", "C", "I", "O", "R", "U",
+ "Ctrl-C", "Ctrl-O", "Ctrl-P", "Ctrl-S"}) {
km.remove(s);
}
+ for (int i = 0; i <= 9; i++) {
+ km.remove("Ctrl-" + i);
+ }
CodeMirror.addKeyMap("vim_ro", km);
+
CodeMirror.mapVimKey("j", "gj");
CodeMirror.mapVimKey("k", "gk");
CodeMirror.mapVimKey("Down", "gj");