Skip to content

The Unified and Autonomous Development Platform

Some minor bug fixes

Robin Shen106e923c6650
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java
index 1448953607..c75133aeca 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java
@@ -85,12 +85,15 @@ public abstract class IssueLinkPanel extends Panel {
super.renderHead(response);
String script = String.format(""
+ "$('#%s a:not(.embedded-reference)').click(function(e) {\n"
- + " if (!e.ctrlKey && !e.metaKey) {\n"
- + " $('#%s').click();\n"
+ + " if (!e.ctrlKey && !e.metaKey) {"
+ + " if (%b)\n"
+ + " $('#%s').click();\n"
+ + " else\n"
+ + " window.location.href=$(this).attr('href');"
+ " return false;\n"
+ " }\n"
+ "});",
- getMarkupId(), numberLink.getMarkupId());
+ getMarkupId(), getCursor()!=null, numberLink.getMarkupId());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 6ef4823662..34e05d1f65 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -221,6 +221,8 @@ onedev.server = {
Wicket.Event.subscribe('/ajax/call/done', function() {
ongoingAjaxRequests--;
+ if (ongoingAjaxRequests < 0)
+ ongoingAjaxRequests = 0;
if (ongoingAjaxRequests == 0) {
var $ajaxLoadingIndicator = $("#ajax-loading-indicator");
if ($ajaxLoadingIndicator[0].timer) {