opendev/gerrit
Code Issues Proposed changes

Merge "InlineEdit: Adapt SBS2 to recently made code changes"

Browse Source
This commit is contained in:
David Pursehouse
2014-10-21 06:14:09 +00:00
committed by Gerrit Code Review
parent 849cbd8f6d d67ea8fb07
commit a7789f871b
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
View File

@@ -433,7 +433,7 @@ public class ChangeScreen2 extends Screen {
reviewMode.setVisible(!editMode.isVisible()); reviewMode.setVisible(!editMode.isVisible());
editFileAction = new EditFileAction( editFileAction = new EditFileAction(
new PatchSet.Id(changeId, edit == null ? rev._number() : 0), new PatchSet.Id(changeId, edit == null ? rev._number() : 0),
"", "", style.replyBox(), editMessage, reply); "", "", style, editMessage, reply);
} else { } else {
editMode.setVisible(false); editMode.setVisible(false);
addFile.setVisible(false); addFile.setVisible(false);

14
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileAction.java
View File

@@ -22,22 +22,22 @@ import com.google.gwt.user.client.ui.Widget;
import com.google.gwtexpui.globalkey.client.GlobalKey; import com.google.gwtexpui.globalkey.client.GlobalKey;
import com.google.gwtexpui.user.client.PluginSafePopupPanel; import com.google.gwtexpui.user.client.PluginSafePopupPanel;
public class EditFileAction { class EditFileAction {
private final PatchSet.Id id; private final PatchSet.Id id;
private final String content; private final String content;
private final String file; private final String file;
private final String style; private final ChangeScreen2.Style style;
private final Widget editMessageButton; private final Widget editMessageButton;
private final Widget relativeTo; private final Widget relativeTo;
private EditFileBox editBox; private EditFileBox editBox;
private PopupPanel popup; private PopupPanel popup;
public EditFileAction( EditFileAction(
PatchSet.Id id, PatchSet.Id id,
String content, String content,
String file, String file,
String style, ChangeScreen2.Style style,
Widget editButton, Widget editButton,
Widget relativeTo) { Widget relativeTo) {
this.id = id; this.id = id;
@@ -62,10 +62,8 @@ public class EditFileAction {
} }
final PluginSafePopupPanel p = new PluginSafePopupPanel(true); final PluginSafePopupPanel p = new PluginSafePopupPanel(true);
p.setStyleName(style); p.setStyleName(style.replyBox());
if (editMessageButton != null) { p.addAutoHidePartner(editMessageButton.getElement());
p.addAutoHidePartner(editMessageButton.getElement());
}
p.addCloseHandler(new CloseHandler<PopupPanel>() { p.addCloseHandler(new CloseHandler<PopupPanel>() {
@Override @Override
public void onClose(CloseEvent<PopupPanel> event) { public void onClose(CloseEvent<PopupPanel> event) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
View File

@@ -332,7 +332,7 @@ public class FileTable extends FlowPanel {
@Override @Override
public void onSuccess(String result) { public void onSuccess(String result) {
EditFileAction edit = new EditFileAction( EditFileAction edit = new EditFileAction(
id, result, path, style.replyBox(), editButton, replyButton); id, result, path, style, editButton, replyButton);
edit.onEdit(); edit.onEdit();
} }
}); });

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java
View File

@@ -52,7 +52,6 @@ class PatchSetSelectBox2 extends Composite {
interface BoxStyle extends CssResource { interface BoxStyle extends CssResource {
String selected(); String selected();
String replyBox();
} }
@UiField Image icon; @UiField Image icon;

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.ui.xml
View File

@@ -56,10 +56,6 @@ limitations under the License.
.iconCell { .iconCell {
width: 16px; width: 16px;
} }
.replyBox {
background-color: trimColor;
z-index: 10;
}
</ui:style> </ui:style>
<g:HTMLPanel> <g:HTMLPanel>
<table class='{style.table}'> <table class='{style.table}'>