Merge branch 'stable-2.7', 'stable-2.6'
* stable-2.7, stable-2.6: Rename "Old Version History" to "Reference Version" on the change screen Documentation: Rename Server Programs Improve submodule subscription documentation Fix spelling mistakes in contributor documentation Update documentation of the create-account command Documentation: Clearer structure on front page Update build instructions in developer documentation Correct a typo in help text for --draft on push options Rename "Old Version History" to "Reference Version" on the change screen Handle 'Event.ONPASTE' in CreateProjectScreen
This commit is contained in:
@@ -27,6 +27,7 @@ import com.google.gerrit.client.projects.ProjectInfo;
|
||||
import com.google.gerrit.client.projects.ProjectMap;
|
||||
import com.google.gerrit.client.rpc.GerritCallback;
|
||||
import com.google.gerrit.client.ui.HintTextBox;
|
||||
import com.google.gerrit.client.ui.OnEditEnabler;
|
||||
import com.google.gerrit.client.ui.ProjectListPopup;
|
||||
import com.google.gerrit.client.ui.ProjectNameSuggestOracle;
|
||||
import com.google.gerrit.client.ui.ProjectsTable;
|
||||
@@ -34,11 +35,14 @@ import com.google.gerrit.client.ui.Screen;
|
||||
import com.google.gerrit.common.PageLinks;
|
||||
import com.google.gerrit.common.ProjectUtil;
|
||||
import com.google.gerrit.reviewdb.client.Project;
|
||||
import com.google.gwt.core.client.Scheduler;
|
||||
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
|
||||
import com.google.gwt.event.dom.client.ClickEvent;
|
||||
import com.google.gwt.event.dom.client.ClickHandler;
|
||||
import com.google.gwt.event.dom.client.KeyCodes;
|
||||
import com.google.gwt.event.dom.client.KeyPressEvent;
|
||||
import com.google.gwt.event.dom.client.KeyPressHandler;
|
||||
import com.google.gwt.user.client.Event;
|
||||
import com.google.gwt.user.client.History;
|
||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||
import com.google.gwt.user.client.ui.Anchor;
|
||||
@@ -110,8 +114,8 @@ public class CreateProjectScreen extends Screen {
|
||||
final VerticalPanel fp = new VerticalPanel();
|
||||
fp.setStyleName(Gerrit.RESOURCES.css().createProjectPanel());
|
||||
|
||||
initCreateTxt();
|
||||
initCreateButton();
|
||||
initCreateTxt();
|
||||
initParentBox();
|
||||
|
||||
addGrid(fp);
|
||||
@@ -129,7 +133,23 @@ public class CreateProjectScreen extends Screen {
|
||||
}
|
||||
|
||||
private void initCreateTxt() {
|
||||
project = new NpTextBox();
|
||||
project = new NpTextBox() {
|
||||
@Override
|
||||
public void onBrowserEvent(Event event) {
|
||||
super.onBrowserEvent(event);
|
||||
if (event.getTypeInt() == Event.ONPASTE) {
|
||||
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
|
||||
@Override
|
||||
public void execute() {
|
||||
if (project.getValue().trim().length() != 0) {
|
||||
create.setEnabled(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
project.sinkEvents(Event.ONPASTE);
|
||||
project.setVisibleLength(50);
|
||||
project.addKeyPressHandler(new KeyPressHandler() {
|
||||
@Override
|
||||
@@ -139,10 +159,12 @@ public class CreateProjectScreen extends Screen {
|
||||
}
|
||||
}
|
||||
});
|
||||
new OnEditEnabler(create, project);
|
||||
}
|
||||
|
||||
private void initCreateButton() {
|
||||
create = new Button(Util.C.buttonCreateProject());
|
||||
create.setEnabled(false);
|
||||
create.addClickHandler(new ClickHandler() {
|
||||
@Override
|
||||
public void onClick(final ClickEvent event) {
|
||||
|
||||
@@ -146,7 +146,7 @@ public interface ChangeConstants extends Constants {
|
||||
String buttonAbandonChangeSend();
|
||||
String headingAbandonMessage();
|
||||
String abandonChangeTitle();
|
||||
String oldVersionHistory();
|
||||
String referenceVersion();
|
||||
String baseDiffItem();
|
||||
String autoMerge();
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ buttonAbandonChangeBegin = Abandon Change
|
||||
buttonAbandonChangeSend = Abandon Change
|
||||
headingAbandonMessage = Abandon Message:
|
||||
abandonChangeTitle = Code Review - Abandon Change
|
||||
oldVersionHistory = Old Version History:
|
||||
referenceVersion = Reference Version:
|
||||
baseDiffItem = Base
|
||||
autoMerge = Auto Merge
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ public class ChangeScreen extends Screen
|
||||
|
||||
patchesGrid = new Grid(1, 2);
|
||||
patchesGrid.setStyleName(Gerrit.RESOURCES.css().selectPatchSetOldVersion());
|
||||
patchesGrid.setText(0, 0, Util.C.oldVersionHistory());
|
||||
patchesGrid.setText(0, 0, Util.C.referenceVersion());
|
||||
patchesGrid.setWidget(0, 1, patchesList);
|
||||
add(patchesGrid);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user