Skip to content

The Unified and Autonomous Development Platform

Add image loading indicator while enlarge images in markdown

Robin Shen516d1fa1c570
diff --git a/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
index c79a7370e2..8d6f73d096 100644
--- a/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
+++ b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
@@ -9,8 +9,6 @@ import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.PackageResourceReference;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -44,10 +42,8 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {
super.renderHead(component, response);
response.render(JavaScriptReferenceHeaderItem.forReference(new InfiniteScrollResourceReference()));
- CharSequence url = RequestCycle.get().urlFor(new PackageResourceReference(
- InfiniteScrollBehavior.class, "ajax-indicator.gif"), new PageParameters());
- String script = String.format("onedev.infiniteScroll.init('%s', %s, '%s', %s);",
- component.getMarkupId(true), getCallbackFunction(explicit("page")), url, pageSize);
+ String script = String.format("onedev.infiniteScroll.init('%s', %s, %s);",
+ component.getMarkupId(true), getCallbackFunction(explicit("page")), pageSize);
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
index 08dfbb2768..f59dac7153 100644
--- a/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
+++ b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
@@ -1,8 +1,7 @@
onedev.infiniteScroll = {
- init: function(containerId, callback, loadingIndicatorUrl, pageSize) {
+ init: function(containerId, callback, pageSize) {
var $container = $("#" + containerId);
$container.data("callback", callback);
- $container.data("loadingIndicatorUrl", loadingIndicatorUrl);
$container.data("page", 1);
$container.data("pageSize", pageSize);
$container.scroll(function() {
@@ -32,10 +31,10 @@ onedev.infiniteScroll = {
page++;
$container.data("page", page);
if ($container.is("ul")) {
- $container.append("<li class='loading-indicator'><img src='" + $container.data("loadingIndicatorUrl") + "'></img></li>");
+ $container.append("<li class='loading-indicator'><img src='/img/ajax-indicator.gif'></img></li>");
} else {
var colspan = $lastItem.children().length;
- $lastItem.parent().append("<tr class='loading-indicator'><td colspan='" + colspan + "'><img src='" + $container.data("loadingIndicatorUrl") + "'></img></td></tr>");
+ $lastItem.parent().append("<tr class='loading-indicator'><td colspan='" + colspan + "'><img src='/img/ajax-indicator.gif'></img></td></tr>");
}
$container.scrollIntoView(".loading-indicator");
$container.data("callback")(page);
diff --git a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.html b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.html
deleted file mode 100644
index c82f55977e..0000000000
--- a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<wicket:panel>
- <div class="loading">
- <wicket:link>
- <img src="ajax-indicator.gif"></img> Loading...
- </wicket:link>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java
deleted file mode 100644
index de9c7304ed..0000000000
--- a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.onedev.server.web.component.loadingindicator;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-public class LoadingIndicator extends Panel {
-
- public LoadingIndicator(String id) {
- super(id);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new LoadingIndicatorResourceReference()));
- }
-
-}
diff --git a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java
deleted file mode 100644
index 22eabc7ece..0000000000
--- a/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.loadingindicator;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class LoadingIndicatorResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public LoadingIndicatorResourceReference() {
- super(LoadingIndicatorResourceReference.class, "loading-indicator.css");
- }
-
-}
diff --git a/web/src/main/java/io/onedev/server/web/component/loadingindicator/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/component/loadingindicator/ajax-indicator.gif
deleted file mode 100644
index 085ccaecaf..0000000000
Binary files a/web/src/main/java/io/onedev/server/web/component/loadingindicator/ajax-indicator.gif and /dev/null differ
diff --git a/web/src/main/java/io/onedev/server/web/component/loadingindicator/loading-indicator.css b/web/src/main/java/io/onedev/server/web/component/loadingindicator/loading-indicator.css
deleted file mode 100644
index 5844bd24a4..0000000000
--- a/web/src/main/java/io/onedev/server/web/component/loadingindicator/loading-indicator.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.floating>.content>div>.loading {
- padding: 8px;
-}
\ No newline at end of file
diff --git a/web/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index 8ec3eebd3e..af75db0258 100644
--- a/web/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -321,3 +321,9 @@ body.fullscreen {
text-decoration: none;
}
+.markdown-image-loading {
+ position: absolute;
+ left: 0;
+ top: 0;
+ background: url("/img/ajax-indicator-big.gif") center no-repeat;
+}
\ No newline at end of file
diff --git a/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index 50af2581e7..2688fab261 100644
--- a/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -841,9 +841,14 @@ onedev.server.markdown = {
if ($image.closest("a").length == 0) {
$image.click(function() {
var $image = $(this);
+ $image.parent().css("position", "relative");
+ var $loadingIndicator = $("<div class='markdown-image-loading'></div>");
+ $loadingIndicator.css("width", $image.width()).css("height", $image.height());
+ $image.parent().append($loadingIndicator);
+
var actualImage = new Image();
actualImage.onload = function() {
-
+ $loadingIndicator.remove();
var $modal = $("" +
"<div class='modal fade' role='dialog' tabindex='-1'>" +
" <div class='modal-dialog' style='width: " + (actualImage.width+2) + "px; max-width: 90%;'>" +
diff --git a/web/src/main/java/io/onedev/server/web/page/project/branches/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/img/ajax-indicator-big.gif
similarity index 100%
rename from web/src/main/java/io/onedev/server/web/page/project/branches/ajax-indicator.gif
rename to web/src/main/java/io/onedev/server/web/img/ajax-indicator-big.gif
diff --git a/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/img/ajax-indicator.gif
similarity index 100%
rename from web/src/main/java/io/onedev/server/web/behavior/infinitescroll/ajax-indicator.gif
rename to web/src/main/java/io/onedev/server/web/img/ajax-indicator.gif
diff --git a/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index f998407b33..6809f6659b 100644
--- a/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -57,9 +57,7 @@
<div class="center"><ul wicket:id="branchesPageNav"></ul></div>
<div wicket:id="noBranches" class="alert alert-warning">No branches found</div>
<div id="searching-branches" class="ajax-indicator">
- <wicket:link>
- <img src="ajax-indicator.gif"></img>
- </wicket:link>
+ <img src="/img/ajax-indicator-big.gif"></img>
</div>
</div>
</div>
diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
index 14172cbf22..736967eb0e 100644
--- a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
+++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html
@@ -40,9 +40,7 @@
</div>
<div wicket:id="mergePreview" class="merge-preview">
<div wicket:id="calculating">
- <wicket:link>
- <img src="ajax-indicator.gif"></img> Calculating merge preview...
- </wicket:link>
+ <img src="/img/ajax-indicator.gif"></img> Calculating merge preview...
</div>
<div wicket:id="noConflict" class="no-conflict">
<label><i class="fa fa-check-circle"></i> Able to merge without conflicts</label>
diff --git a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif
deleted file mode 100644
index 085ccaecaf..0000000000
Binary files a/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif and /dev/null differ