The Unified and Autonomous Development Platform
Remove symbol tooltip loading indicator to make it less clutter
Robin Shena10641a45ef3
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.javaindex 45e1190242..d71096562a 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@@ -23,8 +23,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;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 org.apache.wicket.request.resource.ResourceReference;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;@@ -34,8 +32,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.search.code.IndexConstants;import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.IndexConstants;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.hit.SymbolHit;import io.onedev.server.search.code.query.BlobQuery;@@ -44,7 +42,6 @@ import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRendererer;@@ -275,15 +272,8 @@ public abstract class SymbolTooltipPanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new SymbolTooltipResourceReference()));- ResourceReference ajaxIndicator;- if (((BasePage)getPage()).isDarkMode())- ajaxIndicator = new PackageResourceReference(SymbolTooltipPanel.class, "dark-ajax-indicator.gif");- else- ajaxIndicator = new PackageResourceReference(SymbolTooltipPanel.class, "ajax-indicator.gif");-- String script = String.format("onedev.server.symboltooltip.init('%s', %s, '%s');",- getMarkupId(), getCallbackFunction(explicit("revision"), explicit("symbol")),- RequestCycle.get().urlFor(ajaxIndicator, new PageParameters()));+ String script = String.format("onedev.server.symboltooltip.init('%s', %s);",+ getMarkupId(), getCallbackFunction(explicit("revision"), explicit("symbol")));response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/ajax-indicator.gif b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/ajax-indicator.gifdeleted file mode 100644index a1c6db0962..0000000000Binary files a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/ajax-indicator.gif and /dev/null differdiff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/dark-ajax-indicator.gif b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/dark-ajax-indicator.gifdeleted file mode 100644index 051ef7bbad..0000000000Binary files a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/dark-ajax-indicator.gif and /dev/null differdiff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.jsindex 8a8049ff58..f8e7553334 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js@@ -1,5 +1,5 @@onedev.server.symboltooltip = {- init: function(containerId, queryCallback, ajaxIndicatorUrl) {+ init: function(containerId, queryCallback) {var container = document.getElementById(containerId);var showTimer;@@ -53,8 +53,7 @@ onedev.server.symboltooltip = {onedev.server.symboltooltip.removeTooltip(container);}- var $tooltip = $("<div class='symbol-tooltip overflow-auto' id='" + containerId- + "-symbol-tooltip'><div class='d-flex align-items-center justify-content-center'><img width='24' height='24' src=" + ajaxIndicatorUrl + "></img></div></div>");+ var $tooltip = $("<div class='symbol-tooltip d-none overflow-auto' id='" + containerId + "-symbol-tooltip'></div>");container.tooltip = $tooltip[0];container.tooltip.symbolEl = symbolEl;document.body.appendChild(container.tooltip);@@ -82,6 +81,7 @@ onedev.server.symboltooltip = {var $content = $("#" + contentId);var $container = $content.parent();var $tooltip = $("#" + $container.attr("id") + "-symbol-tooltip");+ $tooltip.removeClass("d-none");if ($tooltip.length != 0)$tooltip.html($content.children()).align($tooltip.data("alignment"));},