Switch all hyperlinks to be InlineHyperlink
This avoids an unnecessary <div> wrapper around the link element,
saving a bit of DOM memory usage. We also really didn't want to
see the block display format from the <div> and were overriding
it with CSS. Its easier if its just not there.
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
index af5a6e7..925377e 100644
--- a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
@@ -31,8 +31,7 @@
public ChangeLink(final String text, final Change.Id c) {
super(text, Link.toChange(c));
- final String href = permalink(c);
- DOM.setElementProperty(DOM.getFirstChild(getElement()), "href", href);
+ DOM.setElementProperty(getElement(), "href", permalink(c));
id = c;
}
diff --git a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
index efbaee2..5493034 100644
--- a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
@@ -19,7 +19,7 @@
import com.google.gerrit.client.Gerrit;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.InlineHyperlink;
/**
* Link to a Screen which can carry richer payload.
@@ -30,7 +30,7 @@
* screen to show some limited information early, before RPCs required to fully
* populate it are even started.
*/
-public abstract class DirectScreenLink extends Hyperlink {
+public abstract class DirectScreenLink extends InlineHyperlink {
/**
* Creates a link with its text and target history token specified.
*
diff --git a/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
index f23d590..90cbbc0 100644
--- a/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
+++ b/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
@@ -17,19 +17,16 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.AnchorElement;
import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.Accessibility;
-import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.InlineHyperlink;
import com.google.gwt.user.client.ui.impl.HyperlinkImpl;
-public class LinkMenuItem extends Hyperlink {
+public class LinkMenuItem extends InlineHyperlink {
static final HyperlinkImpl impl = GWT.create(HyperlinkImpl.class);
public LinkMenuItem(final String text, final String targetHistoryToken) {
- super((Element) null);
- setText(text);
- setTargetHistoryToken(targetHistoryToken);
+ super(text, targetHistoryToken);
setStyleName("gerrit-MenuItem");
Accessibility.setRole(getElement(), Accessibility.ROLE_MENUITEM);
}
diff --git a/src/main/java/com/google/gerrit/public/gerrit.css b/src/main/java/com/google/gerrit/public/gerrit.css
index d4558ba..4bffa3e 100644
--- a/src/main/java/com/google/gerrit/public/gerrit.css
+++ b/src/main/java/com/google/gerrit/public/gerrit.css
@@ -74,7 +74,6 @@
white-space: nowrap;
}
.gerrit-MenuItem {
- display: inline;
padding-left: 5px;
padding-right: 5px;
}
@@ -648,9 +647,6 @@
.gerrit-PatchSetUserIdentity {
white-space: nowrap;
}
-.gerrit-PatchSetUserIdentity .gerrit-AccountName {
- display: inline
-}
.gerrit-PatchSetUserIdentity .gwt-InlineLabel {
margin-left: 0.2em;
}
