The Unified and Autonomous Development Platform
Do not reset scroll bar when select job from pipeline
Robin Shen0df63276a7fa
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.jsindex a70f78cfc5..58d931ab40 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js@@ -148,7 +148,7 @@ onedev.server.pipeline = {});}}-+ /*var arrowHead = {left: $job.offset().left - $paper.offset().left,top: $job.offset().top + $job.outerHeight()/2 - $paper.offset().top@@ -167,6 +167,7 @@ onedev.server.pipeline = {from: dependencyJobIndexString,to: jobIndexString});+ */},drawCurve: function(paper, from, to, dependencyJobIndexString, jobIndexString) {var curve = paper.path(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.jsindex 2bcccf6521..1558e50417 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@@ -829,8 +829,6 @@ onedev.server = {onedev.server.icons = icons;$(window).resize(function() {- $(".autofit-parent").removeClass("autofit-parent");-var $autofit = $(".autofit:visible:not(:has('.autofit:visible'))");/** 1. Do not use parents(":not('html'):not('body')") here as it will select $autofit self in@@ -840,8 +838,9 @@ onedev.server = {* causes issues when view/edit code in a autofit container. Note that removing fit-content* will not break safari in this case as only the innermost autofit can have scrollbars*/- $autofit.css("overflow", "auto").parents().not("html").not("body")- .addClass("autofit-parent");+ var $parents = $autofit.css("overflow", "auto").parents().not("html").not("body");+ $parents.addClass("autofit-parent");+ $(".autofit-parent").not($parents).removeClass("autofit-parent");$(document).find(".resize-aware").trigger("resized");});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlindex 39ffaf99c2..ff52c27c69 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html@@ -18,7 +18,7 @@<div wicket:id="errorMessage" class="error-message"></div></wicket:fragment><wicket:fragment wicket:id="jobsFrag">- <div wicket:id="pipeline" class="side autofit"></div>+ <div wicket:id="pipeline" class="side autofit flex-grow-1"></div><div wicket:id="detail" class="main d-flex flex-column flex-grow-1 ml-4"></div></wicket:fragment><wicket:fragment wicket:id="servicesFrag">