Merge "SideBySide2: Don't open draft on right click in gutter"
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 67814c2..dfcbcd9 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 @@
@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();
+ }
+ });
+ }
}
};
}