Skip to content

The Unified and Autonomous Development Platform

Make links in symbol tooltip ctrl-clickable

Robin Shen74f0ea33042f
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CtrlClickBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CtrlClickBehavior.java
new file mode 100644
index 0000000000..713cdc1510
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CtrlClickBehavior.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.behavior;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+
+@SuppressWarnings("serial")
+public class CtrlClickBehavior extends Behavior {
+
+ private Component delegate;
+
+ public CtrlClickBehavior(Component delegate) {
+ this.delegate = delegate;
+ delegate.add(AttributeAppender.append("class", "d-none"));
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ String script = String.format(""
+ + "$('#%s').click(function(e) {\n"
+ + " if (!e.ctrlKey && !e.metaKey) {"
+ + " $('#%s').click();\n"
+ + " return false;\n"
+ + " }\n"
+ + "});",
+ component.getMarkupId(), delegate.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
index 27fad5d4a3..e4582f6ef7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html
@@ -5,6 +5,7 @@
<ul class="declarations list-unstyled">
<li wicket:id="declarations">
<img wicket:id="icon">
+ <a wicket:id="delegateLink"></a>
<a wicket:id="link">
<span wicket:id="label"></span>
<wicket:enclosure child="scope">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index d71096562a..ca89adf538 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -40,6 +40,7 @@ import io.onedev.server.search.code.query.BlobQuery;
import io.onedev.server.search.code.query.SymbolQuery;
import io.onedev.server.search.code.query.TextQuery;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.CtrlClickBehavior;
import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -83,7 +84,8 @@ public abstract class SymbolTooltipPanel extends Panel {
protected void populateItem(ListItem<QueryHit> item) {
final QueryHit hit = item.getModelObject();
item.add(hit.renderIcon("icon"));
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ AjaxLink<Void> delegateLink = new ViewStateAwareAjaxLink<Void>("delegateLink") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -94,7 +96,11 @@ public abstract class SymbolTooltipPanel extends Panel {
}
};
-
+ item.add(delegateLink);
+
+ WebMarkupContainer link = new WebMarkupContainer("link");
+ link.add(new CtrlClickBehavior(delegateLink));
+
CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, getQueryHitParams(hit));
link.add(AttributeAppender.replace("href", url.toString()));
link.add(hit.render("label"));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
index c6bb952e70..6c98ede58f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html
@@ -17,6 +17,7 @@
<li wicket:id="blobs" class="blob text-nowrap border-0">
<div class="d-flex align-items-center flex-nowrap">
<a wicket:id="expandLink" class="expand"><svg wicket:id="icon" class="icon"></svg></a>
+ <a wicket:id="delegateBlobLink"></a>
<a wicket:id="blobLink" class="blob selectable d-inline-block flex-grow-1 flex-shrink-1">
<wicket:svg href="file" class="icon"></wicket:svg>
<span wicket:id="label"></span>
@@ -24,6 +25,7 @@
</div>
<ul wicket:id="hits" class="list-unstyled">
<li wicket:id="hits" class="hit">
+ <a wicket:id="delegateHitLink"></a>
<a wicket:id="hitLink" class="hit selectable d-block">
<img wicket:id="icon"></img>
<span wicket:id="lineNo" class="line-no"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 295fd6c812..204537f85c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -36,6 +36,7 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.search.code.hit.FileHit;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.hit.TextHit;
+import io.onedev.server.web.behavior.CtrlClickBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -443,7 +444,8 @@ public abstract class SearchResultPanel extends Panel {
});
- blobItem.add(new ViewStateAwareAjaxLink<Void>("blobLink") {
+ Component delegateBlobLink;
+ blobItem.add(delegateBlobLink = new ViewStateAwareAjaxLink<Void>("delegateBlobLink") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -452,6 +454,17 @@ public abstract class SearchResultPanel extends Panel {
attributes.getAjaxCallListeners().add(new ConfirmSwitchFileListener());
}
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ activeBlobIndex = blobItem.getIndex();
+ activeHitIndex = -1;
+ onActiveIndexChange(target);
+ }
+
+ });
+
+ blobItem.add(new WebMarkupContainer("blobLink") {
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -470,15 +483,10 @@ public abstract class SearchResultPanel extends Panel {
add(AttributeAppender.replace("href", url.toString()));
setMarkupId(SearchResultPanel.this.getMarkupId() + "-" + blobItem.getIndex());
+
+ add(new CtrlClickBehavior(delegateBlobLink));
}
- @Override
- public void onClick(AjaxRequestTarget target) {
- activeBlobIndex = blobItem.getIndex();
- activeHitIndex = -1;
- onActiveIndexChange(target);
- }
-
});
ExpandStatus expandStatus = RequestCycle.get().getMetaData(ExpandStatusKey.INSTANCE);
@@ -498,8 +506,27 @@ public abstract class SearchResultPanel extends Panel {
@Override
protected void populateItem(final ListItem<QueryHit> hitItem) {
final QueryHit hit = hitItem.getModelObject();
- hitItem.add(new ViewStateAwareAjaxLink<Void>("hitLink") {
+ Component delegateHitLink;
+ hitItem.add(delegateHitLink = new ViewStateAwareAjaxLink<Void>("delegateHitLink") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel(NAV_CHANNEL, AjaxChannel.Type.DROP));
+ attributes.getAjaxCallListeners().add(new ConfirmSwitchFileListener());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ activeBlobIndex = blobItem.getIndex();
+ activeHitIndex = hitItem.getIndex();
+ onActiveIndexChange(target);
+ }
+
+ });
+
+ hitItem.add(new WebMarkupContainer("hitLink") {
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -526,22 +553,10 @@ public abstract class SearchResultPanel extends Panel {
setMarkupId(SearchResultPanel.this.getMarkupId()
+ "-" + blobItem.getIndex() + "-" + hitItem.getIndex());
+
+ add(new CtrlClickBehavior(delegateHitLink));
}
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel(NAV_CHANNEL, AjaxChannel.Type.DROP));
- attributes.getAjaxCallListeners().add(new ConfirmSwitchFileListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- activeBlobIndex = blobItem.getIndex();
- activeHitIndex = hitItem.getIndex();
- onActiveIndexChange(target);
- }
-
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 795b443f3a..b47194918b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,3 +1,2 @@
<wicket:extend>
- <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index c331d117bb..066be5dd6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -18,14 +17,6 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new Link<Void>("test") {
-
- @Override
- public void onClick() {
- }
-
- });
}
@Override