opendev/gerrit
Code Issues Proposed changes

Merge "Populate version from HTML and not compiled into GWT JS"

Browse Source
This commit is contained in:
Shawn Pearce
2013-05-10 21:44:49 +00:00
committed by Gerrit Code Review
parent b313bfe17f 8f1c7fdeb7
commit c6b69e739a
6 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import com.google.gerrit.client.ui.MorphingTabPanel;
import com.google.gerrit.client.ui.PatchLink;
import com.google.gerrit.client.ui.Screen;
import com.google.gerrit.client.ui.ScreenLoadEvent;
import com.google.gerrit.common.ClientVersion;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.data.GerritConfig;
import com.google.gerrit.common.data.GitwebConfig;
@@ -434,19 +433,13 @@ public class Gerrit implements EntryPoint {
}
}
private static void populateBottomMenu(final RootPanel btmmenu) {
private static void populateBottomMenu(RootPanel btmmenu, HostPageData hpd) {
final Label keyHelp = new Label(C.keyHelp());
keyHelp.setStyleName(RESOURCES.css().keyhelp());
btmmenu.add(keyHelp);
String vs;
if (GWT.isScript()) {
final ClientVersion v = GWT.create(ClientVersion.class);
vs = v.version().getText();
if (vs.startsWith("v")) {
vs = vs.substring(1);
}
} else {
String vs = hpd.version;
if (vs == null || vs.isEmpty()) {
vs = "dev";
}
@@ -539,7 +532,7 @@ public class Gerrit implements EntryPoint {
applyUserPreferences();
initHistoryHooks();
populateBottomMenu(gBottomMenu);
populateBottomMenu(gBottomMenu, hpd);
refreshMenuBar();
History.addValueChangeHandler(new ValueChangeHandler<String>() {