opendev/gerrit
Code Issues Proposed changes

Merge "Async load popular modes into CodeMirror"

Browse Source
This commit is contained in:
Shawn Pearce
2013-05-21 18:22:55 +00:00
committed by Gerrit Code Review
parent 79e00cd451 73f51d91ba
commit 52bc302f9a
9 changed files with 422 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
View File

@@ -85,8 +85,6 @@ import com.google.gwtjsonrpc.client.impl.ResultDeserializer;
import com.google.gwtjsonrpc.common.AsyncCallback;
import com.google.gwtorm.client.KeyUtil;
import net.codemirror.lib.CodeMirror;
import java.util.ArrayList;
public class Gerrit implements EntryPoint {
@@ -368,7 +366,6 @@ public class Gerrit implements EntryPoint {
initHostname();
Window.setTitle(M.windowTitle1(myHost));
CodeMirror.install();
final HostPageDataService hpd = GWT.create(HostPageDataService.class);
hpd.load(new GerritCallback<HostPageData>() {

35
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.client.diff;
import com.google.gerrit.client.rpc.CallbackGroup;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.ScreenLoadCallback;
import com.google.gerrit.client.ui.Screen;
import com.google.gerrit.reviewdb.client.PatchSet;
@@ -25,6 +27,7 @@ import com.google.gwt.user.client.ui.FlowPanel;
import net.codemirror.lib.CodeMirror;
import net.codemirror.lib.Configuration;
import net.codemirror.lib.ModeInjector;
public class CodeMirrorDemo extends Screen {
private static final int HEADER_FOOTER = 60 + 15 * 2 + 38;
@@ -55,16 +58,30 @@ public class CodeMirrorDemo extends Screen {
protected void onLoad() {
super.onLoad();
CallbackGroup group = new CallbackGroup();
CodeMirror.initLibrary(group.add(new GerritCallback<Void>() {
@Override
public void onSuccess(Void result) {
}
}));
DiffApi.diff(revision, path)
.base(base)
.wholeFile()
.ignoreWhitespace(DiffApi.IgnoreWhitespace.NONE)
.get(new ScreenLoadCallback<DiffInfo>(this) {
.get(group.add(new GerritCallback<DiffInfo>() {
@Override
protected void preDisplay(DiffInfo diff) {
display(diff);
public void onSuccess(final DiffInfo diff) {
new ModeInjector()
.add(getContentType(diff.meta_a()))
.add(getContentType(diff.meta_b()))
.inject(new ScreenLoadCallback<Void>(CodeMirrorDemo.this){
@Override
protected void preDisplay(Void result) {
display(diff);
}
});
}
});
}));
}
@Override
@@ -92,10 +109,8 @@ public class CodeMirrorDemo extends Screen {
.set("readOnly", true)
.set("lineNumbers", true)
.set("tabSize", 2)
.set("mode", getContentType(diff.meta_b()))
.set("value", diff.text_b());
if (diff.meta_b() != null && diff.meta_b().content_type() != null) {
cfg.set("mode", diff.meta_b().content_type());
}
cm = CodeMirror.create(editorContainer.getElement(), cfg);
cm.setWidth("100%");
@@ -108,4 +123,10 @@ public class CodeMirrorDemo extends Screen {
}
});
}
private static String getContentType(DiffInfo.FileMeta meta) {
return meta != null && meta.content_type() != null
? ModeInjector.getContentType(meta.content_type())
: null;
}
}