Skip to content

The Unified and Autonomous Development Platform

fix: abnormal behavior when click image embedded in markdown (#1499)

Robin Shen7029d56efd5b
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java
index 77d517600c..38d68468d0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AlertManager.java
@@ -3,9 +3,13 @@ package io.onedev.server.entitymanager;
import io.onedev.server.model.Alert;
import io.onedev.server.persistence.dao.EntityManager;
+import javax.annotation.Nullable;
+
public interface AlertManager extends EntityManager<Alert> {
- void alert(String subject, String detail, boolean mailError);
+ void alert(String subject, @Nullable String detail, boolean mailError);
+
+ void alert(String subject, @Nullable String detail);
void clear();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
index 88229dc975..68d7b6108e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
@@ -77,6 +77,11 @@ public class DefaultAlertManager extends BaseEntityManager<Alert> implements Ale
dao.persist(alert);
}
+ @Override
+ public void alert(String subject, String detail) {
+ alert(subject, detail, false);
+ }
+
@Listen
public void on(ConnectionLost event) {
if (clusterManager.isLeaderServer()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 2f6ebc32e0..4e05af7c08 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -568,13 +568,13 @@ pre>code {
transform: rotate(360deg);
}
}
-.fade {
- animation-name: fade;
+.fade-in-out {
+ animation-name: fade-in-out;
animation-duration: 2000ms;
animation-iteration-count: infinite;
animation-timing-function: linear;
}
-@keyframes fade {
+@keyframes fade-in-out {
0%,100% { opacity: 0 }
50% { opacity: 1 }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index f2369d081d..f0a4b12082 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -44,7 +44,7 @@
<div wicket:id="title" class="topbar-title"></div>
</div>
<div class="topbar-right text-nowrap">
- <a wicket:id="alerts" class="text-warning topbar-link" title="Alerts"><wicket:svg href="exclamation-circle-o" class="icon fade"></wicket:svg></a>
+ <a wicket:id="alerts" class="text-warning topbar-link" title="Alerts"><wicket:svg href="exclamation-circle-o" class="icon fade-in-out"></wicket:svg></a>
<a wicket:id="showCommandPalette" class="topbar-link command-palette"></a>
<a wicket:id="darkMode" class="topbar-link" title="Toggle dark mode"><svg wicket:id="icon" class="icon"/></a>
<a wicket:id="signIn" class="topbar-link sign-in"><wicket:svg href="login" class="icon"/> <span class="d-none d-sm-inline">Sign In</span></a>