Merge branch 'stable-2.8'
* stable-2.8: SideBySide2: Fix copy in Firefox and Safari Conflicts: gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java Change-Id: I6c7520a987c64e9de2c7146cc87d751e3db48bb3
This commit is contained in:
commit
0fb9ebcd7b
@ -300,14 +300,14 @@ public class SideBySide2 extends Screen {
|
||||
cm.on("gutterClick", onGutterClick(cm));
|
||||
cm.on("focus", updateActiveLine(cm));
|
||||
cm.addKeyMap(KeyMap.create()
|
||||
.on("'a'", upToChange(true))
|
||||
.on("'u'", upToChange(false))
|
||||
.on("A", upToChange(true))
|
||||
.on("U", upToChange(false))
|
||||
.on("[", header.navigate(Direction.PREV))
|
||||
.on("]", header.navigate(Direction.NEXT))
|
||||
.on("'r'", header.toggleReviewed())
|
||||
.on("'o'", commentManager.toggleOpenBox(cm))
|
||||
.on("R", header.toggleReviewed())
|
||||
.on("O", commentManager.toggleOpenBox(cm))
|
||||
.on("Enter", commentManager.toggleOpenBox(cm))
|
||||
.on("'c'", commentManager.insertNewDraft(cm))
|
||||
.on("C", commentManager.insertNewDraft(cm))
|
||||
.on("N", maybeNextVimSearch(cm))
|
||||
.on("P", chunkManager.diffChunkNav(cm, Direction.PREV))
|
||||
.on("Shift-M", header.reviewedAndNext())
|
||||
@ -316,7 +316,7 @@ public class SideBySide2 extends Screen {
|
||||
.on("Shift-O", commentManager.openCloseAll(cm))
|
||||
.on("Shift-Left", moveCursorToSide(cm, DisplaySide.A))
|
||||
.on("Shift-Right", moveCursorToSide(cm, DisplaySide.B))
|
||||
.on("'i'", new Runnable() {
|
||||
.on("I", new Runnable() {
|
||||
public void run() {
|
||||
switch (getIntraLineStatus()) {
|
||||
case OFF:
|
||||
|
Loading…
Reference in New Issue
Block a user