opendev/gerrit
Code Issues Proposed changes

Merge "SideBySide2: Let CodeMirror handle "contextmenu" event" into stable-2.8

Browse Source
This commit is contained in:
Shawn Pearce
2013-11-07 18:32:19 +00:00
committed by Gerrit Code Review
parent eef29c13ea 98d6799c7d
commit 8a982b6769
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,6 @@ import com.google.gwtexpui.globalkey.client.KeyCommandSet;
import com.google.gwtexpui.globalkey.client.ShowHelpCommand; import com.google.gwtexpui.globalkey.client.ShowHelpCommand;
import net.codemirror.lib.CodeMirror; import net.codemirror.lib.CodeMirror;
import net.codemirror.lib.CodeMirror.EventHandler;
import net.codemirror.lib.CodeMirror.GutterClickHandler; import net.codemirror.lib.CodeMirror.GutterClickHandler;
import net.codemirror.lib.CodeMirror.LineClassWhere; import net.codemirror.lib.CodeMirror.LineClassWhere;
import net.codemirror.lib.CodeMirror.LineHandle; import net.codemirror.lib.CodeMirror.LineHandle;
@@ -111,7 +110,6 @@ public class SideBySide2 extends Screen {
private CodeMirror cmA; private CodeMirror cmA;
private CodeMirror cmB; private CodeMirror cmB;
private CodeMirror lastFocused;
private ScrollSynchronizer scrollingGlue; private ScrollSynchronizer scrollingGlue;
private HandlerRegistration resizeHandler; private HandlerRegistration resizeHandler;
private JsArray<CommentInfo> publishedBase; private JsArray<CommentInfo> publishedBase;
@@ -279,17 +277,9 @@ public class SideBySide2 extends Screen {
cm.on("focus", new Runnable() { cm.on("focus", new Runnable() {
@Override @Override
public void run() { public void run() {
lastFocused = cm;
updateActiveLine(cm).run(); updateActiveLine(cm).run();
} }
}); });
cm.on("contextmenu", new EventHandler() {
@Override
public void handle(CodeMirror instance, NativeEvent event) {
CodeMirror.setObjectProperty(event, "codemirrorIgnore", true);
lastFocused.focus();
}
});
cm.addKeyMap(KeyMap.create() cm.addKeyMap(KeyMap.create()
.on("'a'", upToChange(true)) .on("'a'", upToChange(true))
.on("'u'", upToChange(false)) .on("'u'", upToChange(false))

5
gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java vendored
View File

@@ -277,11 +277,6 @@ public class CodeMirror extends JavaScriptObject {
return this.display.scrollbarV; return this.display.scrollbarV;
}-*/; }-*/;
public static final native void setObjectProperty(JavaScriptObject obj,
String name, boolean value) /*-{
obj[name] = value;
}-*/;
public static final native KeyMap cloneKeyMap(String name) /*-{ public static final native KeyMap cloneKeyMap(String name) /*-{
var i = $wnd.CodeMirror.keyMap[name]; var i = $wnd.CodeMirror.keyMap[name];
var o = {}; var o = {};