From c0aaf8d283903ad2d8e0c7f7dc3ec46213a3fdc4 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Wed, 18 Dec 2013 17:00:22 -0800 Subject: [PATCH] SideBySide2: Don't open draft on right click in gutter If the user right clicks on a line number in the gutter, allow the browser default context menu to popup and do not create a new draft comment. Change-Id: I55352b805db5375134f3218c46c5289959a9891a --- .../gerrit/client/diff/SideBySide2.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java index 67814c249a..dfcbcd9199 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java @@ -1309,16 +1309,22 @@ public class SideBySide2 extends Screen { @Override public void handle(CodeMirror instance, int line, String gutter, NativeEvent clickEvent) { - if (!(cm.hasActiveLine() && - cm.getLineNumber(cm.getActiveLine()) == line)) { - cm.setCursor(LineCharacter.create(line)); - } - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - insertNewDraft(cm).run(); + if (clickEvent.getButton() == NativeEvent.BUTTON_LEFT + && !clickEvent.getMetaKey() + && !clickEvent.getAltKey() + && !clickEvent.getCtrlKey() + && !clickEvent.getShiftKey()) { + if (!(cm.hasActiveLine() && + cm.getLineNumber(cm.getActiveLine()) == line)) { + cm.setCursor(LineCharacter.create(line)); } - }); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + insertNewDraft(cm).run(); + } + }); + } } }; }