opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* 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:
David Pursehouse 2014-01-28 18:07:25 +09:00
commit 0fb9ebcd7b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
View File

@ -300,14 +300,14 @@ public class SideBySide2 extends Screen {
cm.on("gutterClick", onGutterClick(cm)); cm.on("gutterClick", onGutterClick(cm));
cm.on("focus", updateActiveLine(cm)); cm.on("focus", updateActiveLine(cm));
cm.addKeyMap(KeyMap.create() cm.addKeyMap(KeyMap.create()
.on("'a'", upToChange(true)) .on("A", upToChange(true))
.on("'u'", upToChange(false)) .on("U", upToChange(false))
.on("[", header.navigate(Direction.PREV)) .on("[", header.navigate(Direction.PREV))
.on("]", header.navigate(Direction.NEXT)) .on("]", header.navigate(Direction.NEXT))
.on("'r'", header.toggleReviewed()) .on("R", header.toggleReviewed())
.on("'o'", commentManager.toggleOpenBox(cm)) .on("O", commentManager.toggleOpenBox(cm))
.on("Enter", commentManager.toggleOpenBox(cm)) .on("Enter", commentManager.toggleOpenBox(cm))
.on("'c'", commentManager.insertNewDraft(cm)) .on("C", commentManager.insertNewDraft(cm))
.on("N", maybeNextVimSearch(cm)) .on("N", maybeNextVimSearch(cm))
.on("P", chunkManager.diffChunkNav(cm, Direction.PREV)) .on("P", chunkManager.diffChunkNav(cm, Direction.PREV))
.on("Shift-M", header.reviewedAndNext()) .on("Shift-M", header.reviewedAndNext())
@ -316,7 +316,7 @@ public class SideBySide2 extends Screen {
.on("Shift-O", commentManager.openCloseAll(cm)) .on("Shift-O", commentManager.openCloseAll(cm))
.on("Shift-Left", moveCursorToSide(cm, DisplaySide.A)) .on("Shift-Left", moveCursorToSide(cm, DisplaySide.A))
.on("Shift-Right", moveCursorToSide(cm, DisplaySide.B)) .on("Shift-Right", moveCursorToSide(cm, DisplaySide.B))
.on("'i'", new Runnable() { .on("I", new Runnable() {
public void run() { public void run() {
switch (getIntraLineStatus()) { switch (getIntraLineStatus()) {
case OFF: case OFF: