The Unified and Autonomous Development Platform
Fix some minor dropdown alignment bug
Robin Shen2b746f8693b1
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex e4619f3d55..0adf8b10c1 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -350,7 +350,7 @@ import io.onedev.server.web.page.layout.AdministrationSettingContribution;import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;import io.onedev.server.web.page.layout.MainMenuCustomization;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.test.TestPage;@@ -705,7 +705,7 @@ public class CoreModule extends AbstractPluginModule {bind(CommitIndexedBroadcaster.class);contributeFromPackage(DiffRenderer.class, DiffRenderer.class);- contributeFromPackage(BlobRendererer.class, BlobRendererer.class);+ contributeFromPackage(BlobRenderer.class, BlobRenderer.class);contribute(Extension.class, new EmojiExtension());contribute(Extension.class, new SourcePositionTrackExtension());diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 810280dda3..7014791a43 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -295,7 +295,7 @@ public class OneDev extends AbstractPlugin implements Serializable {}executorService.shutdown();}-+public Object writeReplace() throws ObjectStreamException {return new ManagedSerializedForm(OneDev.class);}diff --git a/server-core/src/main/java/io/onedev/server/git/Blob.java b/server-core/src/main/java/io/onedev/server/git/Blob.javaindex 56255cd717..6a5b83fbe8 100644--- a/server-core/src/main/java/io/onedev/server/git/Blob.java+++ b/server-core/src/main/java/io/onedev/server/git/Blob.java@@ -20,7 +20,7 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.ContentDetector;-import io.onedev.server.web.component.markdown.SuggestionSupport.SuggestFor;+import io.onedev.server.web.component.markdown.SuggestionSupport.Selection;public class Blob {@@ -198,7 +198,7 @@ public class Blob {return lines;}- public SuggestFor getSuggestFor(String fileName, PlanarRange range) {+ public Selection getSelection(PlanarRange range) {List<String> editLines = new ArrayList<>();for (int i=range.getFromRow(); i<=range.getToRow(); i++)@@ -209,8 +209,7 @@ public class Blob {to += editLines.get(i).length() + 1;to += range.getToColumn();- return new SuggestFor(fileName, editLines,- new LinearRange(range.getFromColumn(), to));+ return new Selection(editLines, new LinearRange(range.getFromColumn(), to));}}diff --git a/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.javaindex 92d65a28ef..7f9f5bab87 100644--- a/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/BuildProcessor.java@@ -25,7 +25,8 @@ public class BuildProcessor extends ReferenceParser implements MarkdownProcessor@Overridepublic void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {parseReferences(document, project);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.javaindex ae7120e85d..bba0a97e5f 100644--- a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java@@ -20,7 +20,7 @@ import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffRenderer;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.component.markdown.SuggestionSupport.SuggestFor;+import io.onedev.server.web.component.markdown.SuggestionSupport.Selection;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;public class CodeProcessor implements MarkdownProcessor {@@ -28,7 +28,8 @@ public class CodeProcessor implements MarkdownProcessor {@Overridepublic void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {Collection<Element> codeElements = new ArrayList<>();NodeTraversor.traverse(new NodeVisitor() {@@ -62,32 +63,36 @@ public class CodeProcessor implements MarkdownProcessor {if (language != null) {codeElement.attr("data-language", language);- if (suggestionSupport != null && language.equals("suggestion")) {- String suggestionContent = codeElement.wholeText();- if (suggestionContent.endsWith("\n"))- suggestionContent = suggestionContent.substring(0, suggestionContent.length()-1);- List<String> suggestion = StringUtils.splitToLines(suggestionContent);- SuggestFor suggestFor = suggestionSupport.getSuggestFor();- List<String> content = suggestFor.getContent();- List<DiffBlock<String>> diffBlocks = DiffUtils.diff(content, suggestion);- codeElement.html("<div class='pb-2 mb-2 head font-size-xs mx-n2 px-2'>Suggested change</div>"- + new DiffRenderer(diffBlocks).renderDiffs());- codeElement.attr("data-suggestion", suggestionContent);- codeElement.attr("data-suggestionfile", suggestFor.getFileName());- codeElement.parent().addClass("suggestion");- if (suggestionSupport.isOutdated())- codeElement.attr("data-suggestionoutdated", "true");- if (suggestionSupport.getApplySupport() != null) {- codeElement.attr("data-suggestionappliable", "true");- if (suggestionSupport.getApplySupport().getBatchSupport() != null) {- codeElement.attr("data-suggestionbatchappliable", "true");- if (suggestionSupport.getApplySupport().getBatchSupport().getInBatch() != null) {- if (suggestionSupport.getApplySupport().getBatchSupport().getInBatch().equals(suggestion))- codeElement.attr("data-suggestionapplyinbatch", "true");- else- codeElement.attr("data-suggestionoutdated", "true");+ if (language.equals("suggestion")) {+ if (suggestionSupport != null) {+ String suggestionContent = codeElement.wholeText();+ if (suggestionContent.endsWith("\n"))+ suggestionContent = suggestionContent.substring(0, suggestionContent.length()-1);+ List<String> suggestion = StringUtils.splitToLines(suggestionContent);+ Selection selection = suggestionSupport.getSelection();+ List<String> content = selection.getContent();+ List<DiffBlock<String>> diffBlocks = DiffUtils.diff(content, suggestion);+ codeElement.html("<div class='pb-2 mb-2 head font-size-xs mx-n2 px-2'>Suggested change</div>"+ + new DiffRenderer(diffBlocks).renderDiffs());+ codeElement.attr("data-suggestion", suggestionContent);+ codeElement.attr("data-suggestionfile", suggestionSupport.getFileName());+ codeElement.parent().addClass("suggestion");+ if (suggestionSupport.isOutdated())+ codeElement.attr("data-suggestionoutdated", "true");+ if (suggestionSupport.getApplySupport() != null) {+ codeElement.attr("data-suggestionappliable", "true");+ if (suggestionSupport.getApplySupport().getBatchSupport() != null) {+ codeElement.attr("data-suggestionbatchappliable", "true");+ if (suggestionSupport.getApplySupport().getBatchSupport().getInBatch() != null) {+ if (suggestionSupport.getApplySupport().getBatchSupport().getInBatch().equals(suggestion))+ codeElement.attr("data-suggestionapplyinbatch", "true");+ else+ codeElement.attr("data-suggestionoutdated", "true");+ }}}+ } else {+ codeElement.prepend("<p><i>Suggested change</i></p>");}}}diff --git a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.javaindex b9dd740d30..80340e35a8 100644--- a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java@@ -31,7 +31,8 @@ public class CommitProcessor implements MarkdownProcessor {@Overridepublic void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {if (RequestCycle.get() != null) {TextNodeVisitor visitor = new TextNodeVisitor() {diff --git a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.javaindex e69070c19f..75d72b07d5 100644--- a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java+++ b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java@@ -96,7 +96,7 @@ public class DefaultMarkdownManager implements MarkdownManager {@Nullable SuggestionSupport suggestionSupport, boolean forExternal) {document = HtmlUtils.sanitize(document);for (MarkdownProcessor htmlTransformer: htmlTransformers)- htmlTransformer.process(document, project, blobRenderContext, suggestionSupport);+ htmlTransformer.process(document, project, blobRenderContext, suggestionSupport, forExternal);if (forExternal) {for (Element element: document.body().getElementsByTag("img")) {diff --git a/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.javaindex 3076e83adb..ae2c960b65 100644--- a/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/IssueProcessor.java@@ -22,7 +22,8 @@ public class IssueProcessor extends ReferenceParser implements MarkdownProcessor@Overridepublic void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {parseReferences(document, project);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.javaindex 8d37bf5250..5a19d7e2d9 100644--- a/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java@@ -14,6 +14,7 @@ public interface MarkdownProcessor {void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport);+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.javaindex 37eb2b5b90..85b56dfb0e 100644--- a/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java@@ -16,7 +16,8 @@ public class MentionProcessor extends MentionParser implements MarkdownProcessor@Overridepublic void process(Document document, Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {parseMentions(document);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.javaindex 84d256bff1..c1a09683d6 100644--- a/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/PullRequestProcessor.java@@ -22,7 +22,8 @@ public class PullRequestProcessor extends ReferenceParser implements MarkdownPro@Overridepublic void process(Document document, @Nullable Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {parseReferences(document, project);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.javaindex ea340a142a..0f09cc1fcb 100644--- a/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/StrikeThroughProcessor.java@@ -27,7 +27,8 @@ public class StrikeThroughProcessor implements MarkdownProcessor {@Overridepublic void process(Document document, Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {TextNodeVisitor visitor = new TextNodeVisitor() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.javaindex 8f7481748a..1284160d54 100644--- a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java@@ -40,7 +40,8 @@ public class UrlProcessor implements MarkdownProcessor {@Overridepublic void process(Document document, Project project,@Nullable BlobRenderContext blobRenderContext,- @Nullable SuggestionSupport suggestionSupport) {+ @Nullable SuggestionSupport suggestionSupport,+ boolean forExternal) {if (RequestCycle.get() != null && blobRenderContext != null && project != null) {Repository repository = project.getRepository();RevCommit commit;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.jsindex d30b8124e1..83eb720052 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js@@ -1,7 +1,6 @@(function ( $ ) {var pageMargin = 8;- var scrollbarWidth = 20;var textHeight = 25;/**@@ -12,7 +11,7 @@* the target may also includes a index property to denote which character to align with in target* input/textarea element*/- $.fn.align = function(alignment, noNarrowThanTarget) {+ $.fn.align = function(alignment, noNarrowThanTarget, neverShrink) {this.each(function() {var $this = jQuery(this);@@ -30,8 +29,8 @@$this.css("position", "absolute");}- var thisOldWidth = $this.outerWidth();- var thisOldHeight = $this.outerHeight();+ var thisOldWidth = $this[0].offsetWidth;+ var thisOldHeight = $this[0].offsetHeight;var $autosuit = $this.find(".autosuit:visible:not(:has('.autosuit:visible'))");if ($autosuit.length == 0)@@ -44,6 +43,9 @@// even if enclosed content changes$this.find(".autosuit").addBack(this).css("width", "auto").css("height", "auto").css("overflow", "hidden");+ var thisWidth = Math.max($this[0].offsetWidth, $this.outerWidth());+ var thisHeight = Math.max($this[0].offsetHeight, $this.outerHeight());+$autosuit.css("overflow", "auto");var borderTop = jQuery(window).scrollTop() + pageMargin;@@ -51,15 +53,14 @@var borderLeft = jQuery(window).scrollLeft() + pageMargin;var borderRight = borderLeft + jQuery(window).width() - 2*pageMargin;- var thisWidth = $this.outerWidth() + $autosuit[0].scrollWidth - $autosuit.width();- var thisHeight = $this.outerHeight() + $autosuit[0].scrollHeight - $autosuit.height();-- // Do not reduce original dimension as otherwise the popup may flip while filtering its content- // and this will make the typing experience bad- if (thisWidth < thisOldWidth)- thisWidth = thisOldWidth;- if (thisHeight < thisOldHeight)- thisHeight = thisOldHeight;+ if (neverShrink) {+ // Do not reduce original dimension as otherwise the popup may flip while filtering its content+ // and this will make the typing experience bad+ if (thisWidth < thisOldWidth)+ thisWidth = thisOldWidth;+ if (thisHeight < thisOldHeight)+ thisHeight = thisOldHeight;+ }var width = thisWidth;var height = thisHeight;@@ -75,7 +76,7 @@if (alignment.target.element) {var $targetEl = jQuery(alignment.target.element);if (noNarrowThanTarget)- $this.css("minWidth", $targetEl.outerWidth());+ $this.css("minWidth", $targetEl[0].offsetWidth);if (alignment.target.index != undefined) {var coord = getCaretCoordinates(alignment.target.element, alignment.target.index);@@ -91,8 +92,8 @@} else {targetLeft = $targetEl.offset().left;targetTop = $targetEl.offset().top;- targetWidth = $targetEl.outerWidth();- targetHeight = $targetEl.outerHeight();+ targetWidth = $targetEl[0].offsetWidth;+ targetHeight = $targetEl[0].offsetHeight;}} else {targetLeft = alignment.target.left;@@ -213,13 +214,14 @@$this.css({left:left-$parent.offset().left, top:top-$parent.offset().top});- $autosuit.outerWidth($autosuit.outerWidth()+width-thisWidth);- $autosuit.outerHeight($autosuit.outerHeight()+height-thisHeight);+ $autosuit.outerWidth($autosuit[0].offsetWidth+width-thisWidth);+ $autosuit.outerHeight($autosuit[0].offsetHeight+height-thisHeight);+$this.outerWidth(width);$this.outerHeight(height);$autosuit.scrollTop(scrollTop);- $autosuit.scrollLeft(scrollLeft);+ $autosuit.scrollLeft(scrollLeft);});return this;};diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.jsindex b2851cdfa7..2f79fbbae1 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js@@ -67,7 +67,7 @@ onedev.server.infiniteScroll = {else$container.removeData("scrollTop");}- if (showIndicator)+ if (showIndicator && $container.find(".loading-indicator").length != 0)$container.find(".loading-indicator")[0].scrollIntoViewIfNeeded(false);} else if (scrollTop) {$container.removeData("scrollTop");diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlindex a91652f2ef..725c92607c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -87,6 +87,7 @@<wicket:svg href="gear" class="icon icon-sm"></wicket:svg></div><div wicket:id="body" class="body d-flex align-items-center"></div>+ <span wicket:id="labelsHelp" class="form-text font-size-sm text-muted"><wicket:svg href="bulb" class="icon icon-sm"/> Labels can be defined in Administration / Label Management</span></div><div wicket:id="pullRequest" class="pull-request"><div class="font-weight-bolder mb-3">Pull Request</div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex b5bfd30831..e31f7b2b48 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -380,6 +380,8 @@ public abstract class BuildSidePanel extends Panel {}}));+ labelsContainer.add(new WebMarkupContainer("labelsHelp")+ .setVisible(SecurityUtils.canManage(getBuild())));add(labelsContainer);add(new ListView<Input>("params", new LoadableDetachableModel<List<Input>>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 447100cb2a..6199866fde 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -1708,9 +1708,9 @@ public abstract class RevisionDiffPanel extends Panel {return new SuggestionSupport() {@Override- public SuggestFor getSuggestFor() {+ public Selection getSelection() {return getProject().getBlob(mark.getBlobIdent(), true).getText()- .getSuggestFor(mark.getPath(), mark.getRange());+ .getSelection(mark.getRange());}@Override@@ -1857,6 +1857,11 @@ public abstract class RevisionDiffPanel extends Panel {return false;}}++ @Override+ public String getFileName() {+ return mark.getPath();+ }};}diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.javaindex 44c95bb084..71916a76a6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java@@ -25,14 +25,17 @@ public abstract class FloatingPanel extends Panel {private final boolean noNarrowThanTarget;+ private final boolean neverShrink;+private final Animation animation;public FloatingPanel(AjaxRequestTarget target, @Nullable Alignment alignment,- boolean noNarrowThanTarget, @Nullable Animation animation) {+ boolean noNarrowThanTarget, boolean neverShrink, @Nullable Animation animation) {super(((BasePage)target.getPage()).getRootComponents().newChildId());this.alignment = alignment;this.noNarrowThanTarget = noNarrowThanTarget;+ this.neverShrink = neverShrink;this.animation = animation;BasePage page = (BasePage) target.getPage();@@ -54,7 +57,7 @@ public abstract class FloatingPanel extends Panel {}public FloatingPanel(AjaxRequestTarget target, @Nullable Alignment alignment) {- this(target, alignment, false, null);+ this(target, alignment, false, false, null);}@Override@@ -86,9 +89,10 @@ public abstract class FloatingPanel extends Panel {} else {jsonOfAlignment = "undefined";}- String script = String.format("onedev.server.floating.init('%s', %s, %b, %s, %s);",+ String script = String.format("onedev.server.floating.init('%s', %s, %b, %b, %s, %s);",getMarkupId(true), jsonOfAlignment,noNarrowThanTarget,+ neverShrink,animation!=null?"'" + animation + "'":"undefined",getCallbackFunction());response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex 2ebd2ec19c..c1742a1c53 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -1,5 +1,5 @@onedev.server.floating = {- init: function(floatingId, alignment, noNarrowThanTarget, animation, closeCallback) {+ init: function(floatingId, alignment, noNarrowThanTarget, neverShrink, animation, closeCallback) {var $floating = $("#" + floatingId);$floating.data("closeCallback", closeCallback);$floating.data("animation", animation);@@ -56,11 +56,11 @@ onedev.server.floating = {$floating.data("closeCallback")();} else {if (alignment) {- $floating.align(alignment, noNarrowThanTarget);- setTimeout(function() {- $floating.align(alignment, noNarrowThanTarget);- $floating.trigger("resized");- }, 0);+ $floating.align(alignment, noNarrowThanTarget, neverShrink);++ // align again to fix some position/dimension calculation issues+ $floating.align(alignment, noNarrowThanTarget, neverShrink);+ $floating.trigger("resized");}if (!openTriggered) {$floating.trigger("open");diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.javaindex 7af3c259e3..366f1129c2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java@@ -51,7 +51,7 @@ public abstract class JobInfoButton extends Panel {protected void onInitialize() {super.onInitialize();- DropdownLink detailLink = new DropdownLink("detail", false, AlignPlacement.bottom(0), true) {+ DropdownLink detailLink = new DropdownLink("detail", false, AlignPlacement.bottom(0), true, false) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.javaindex a9eb89ca7c..a9be9f2e04 100644--- a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java@@ -26,6 +26,8 @@ public abstract class DropdownLink extends AjaxLink<Void> {private final boolean noNarrowThanTarget;+ private final boolean neverShrink;+private FloatingPanel dropdown;public DropdownLink(String id) {@@ -33,19 +35,21 @@ public abstract class DropdownLink extends AjaxLink<Void> {}public DropdownLink(String id, AlignPlacement placement) {- this(id, false, placement, false);+ this(id, false, placement, false, false);}public DropdownLink(String id, boolean alignTargetMouse) {- this(id, alignTargetMouse, AlignPlacement.bottom(0), false);+ this(id, alignTargetMouse, AlignPlacement.bottom(0), false, false);}- public DropdownLink(String id, boolean alignTargetMouse, AlignPlacement placement, boolean noNarrowThanTarget) {+ public DropdownLink(String id, boolean alignTargetMouse, AlignPlacement placement,+ boolean noNarrowThanTarget, boolean neverShrink) {super(id);this.alignTargetMouse = alignTargetMouse;this.placement = placement;this.noNarrowThanTarget = noNarrowThanTarget;+ this.neverShrink = neverShrink;}@Override@@ -88,7 +92,7 @@ public abstract class DropdownLink extends AjaxLink<Void> {alignFloatingWith = new ComponentTarget(this);}- dropdown = new FloatingPanel(target, new Alignment(alignFloatingWith, placement), noNarrowThanTarget, null) {+ dropdown = new FloatingPanel(target, new Alignment(alignFloatingWith, placement), noNarrowThanTarget, neverShrink, null) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/LazyResourceLoader.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/LazyResourceLoader.javaindex 397e7726eb..4b9c39cdda 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/LazyResourceLoader.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/LazyResourceLoader.java@@ -38,7 +38,7 @@ class LazyResourceLoader extends WebMarkupContainer {if (rendered != null) {if (rendered.contains("class=\"mermaid\""))response.render(JavaScriptHeaderItem.forReference(new MermaidResourceReference()));- else if (rendered.contains("class=\"katex\""))+ if (rendered.contains("class=\"katex\""))response.render(JavaScriptHeaderItem.forReference(new KatexResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex 82b3f51df0..fac22f7c5f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -39,9 +39,10 @@<div class="message">Below content is restored from an unsaved change</div></div><div class="emojis"></div>- <div class="help">- <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted.- <span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span>+ <div class="help text-muted font-size-sm">+ <wicket:svg href="bulb" class="icon icon-sm"></wicket:svg> <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted,+ with <a wicket:id="syntaxHelp" target="_blank">mermaid and katex support</a>.+ <span wicket:id="canAttachFile">You may also drop file/image to the input box, or paste image from clipboard</span></div></div><div class="body d-flex flex-grow-1 overflow-hidden position-relative">diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex a60f61bbc5..8a82b76326 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -67,7 +67,7 @@ import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.markdown.SuggestionSupport.SuggestFor;+import io.onedev.server.web.component.markdown.SuggestionSupport.Selection;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -152,8 +152,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {SuggestionSupport suggestionSupport = new SuggestionSupport() {@Override- public SuggestFor getSuggestFor() {- return MarkdownEditor.this.getSuggestionSupport().getSuggestFor();+ public Selection getSelection() {+ return MarkdownEditor.this.getSuggestionSupport().getSelection();}@Override@@ -165,6 +165,11 @@ public class MarkdownEditor extends FormComponentPanel<String> {public ApplySupport getApplySupport() {return null;}++ @Override+ public String getFileName() {+ return MarkdownEditor.this.getSuggestionSupport().getFileName();+ }};MarkdownManager manager = OneDev.getInstance(MarkdownManager.class);@@ -250,7 +255,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- SuggestFor suggestFor = getSuggestionSupport().getSuggestFor();+ Selection suggestFor = getSuggestionSupport().getSelection();tag.put("data-content", Joiner.on('\n').join(suggestFor.getContent()));tag.put("data-from", suggestFor.getRange().getFrom());tag.put("data-to", suggestFor.getRange().getTo());@@ -303,6 +308,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {container.add(new LazyResourceLoader("lazyResourceLoader", Model.of((String)null)));}+ container.add(new WebMarkupContainer("syntaxHelp")+ .add(AttributeAppender.append("href", OneDev.getInstance().getDocRoot() + "/pages/markdown-syntax.md")));container.add(new WebMarkupContainer("canAttachFile").setVisible(getAttachmentSupport()!=null));container.add(actionBehavior = new AbstractPostAjaxBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.javaindex 9c84af7b14..e8ab39e588 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/SuggestionSupport.java@@ -11,7 +11,9 @@ import io.onedev.commons.utils.LinearRange;public interface SuggestionSupport extends Serializable {- SuggestFor getSuggestFor();+ String getFileName();++ Selection getSelection();boolean isOutdated();@@ -37,24 +39,17 @@ public interface SuggestionSupport extends Serializable {}- class SuggestFor {-- private final String fileName;+ class Selection {private final List<String> content;private final LinearRange range;- public SuggestFor(String fileName, List<String> content, LinearRange range) {- this.fileName = fileName;+ public Selection(List<String> content, LinearRange range) {this.content = content;this.range = range;}- public String getFileName() {- return fileName;- }-public List<String> getContent() {return content;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 19ae578a03..674dc86507 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -472,4 +472,8 @@.markdown-rendered>p:last-child {margin-bottom: 0;+}++.markdown-rendered div.paragraph {+ margin-bottom: 1.2rem;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.javaindex de7c94fdac..32ecc86b1c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java@@ -29,7 +29,7 @@ public abstract class MenuLink extends DropdownLink {}public MenuLink(String id, boolean alignTargetMouse, AlignPlacement placement, boolean noNarrowThanTarget) {- super(id, alignTargetMouse, placement, noNarrowThanTarget);+ super(id, alignTargetMouse, placement, noNarrowThanTarget, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.javaindex 21c1348d0a..cd472b7be9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/offcanvas/OffCanvasPanel.java@@ -16,7 +16,7 @@ public abstract class OffCanvasPanel extends FloatingPanel {public enum Placement {LEFT, RIGHT}public OffCanvasPanel(AjaxRequestTarget target, Placement placement, @Nullable String width) {- super(target, null, false, Animation.valueOf(placement.name()));+ super(target, null, false, false, Animation.valueOf(placement.name()));add(AttributeAppender.append("class", "off-canvas off-canvas-" + placement.name().toLowerCase()));if (width != null)add(AttributeAppender.append("style", "width: " + width).setSeparator(";"));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 ca89adf538..bf0f00bc43 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@@ -44,7 +44,7 @@ import io.onedev.server.web.behavior.CtrlClickBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@SuppressWarnings("serial")public abstract class SymbolTooltipPanel extends Panel {@@ -293,7 +293,7 @@ public abstract class SymbolTooltipPanel extends Panel {public PageParameters getQueryHitParams(QueryHit hit) {BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());return ProjectBlobPage.paramsOf(getProject(), state);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javaindex 3555f2c59f..d6c0210883 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -65,7 +65,7 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {protected void onInitialize() {super.onInitialize();- add(new DropdownLink("addNew", false, AlignPlacement.bottom(0), true) {+ add(new DropdownLink("addNew", false, AlignPlacement.bottom(0), true, true) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {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.cssindex f815af4535..fe3ce55118 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@@ -782,4 +782,4 @@ span.keycap {}.row-gap-5 {row-gap: 2rem;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 11e7fefcd5..b12f36955f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -115,7 +115,7 @@ import io.onedev.server.web.component.revision.RevisionPicker;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.navigator.BlobNavigator;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;import io.onedev.server.web.page.project.blob.render.folder.FolderViewPanel;import io.onedev.server.web.page.project.blob.render.nocommits.NoCommitsPanel;@@ -155,7 +155,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,private static final String PARAM_QUERY = "query";- private static final String PARAM_POSITION = "position";+ public static final String PARAM_POSITION = "position";private static final String PARAM_COVERAGE_REPORT = "coverage-report";@@ -682,7 +682,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,protected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- ProjectBlobPage.this.onSelect(target, selected, BlobRendererer.getSourcePosition(hit.getTokenPos()));+ ProjectBlobPage.this.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getTokenPos()));modal.close();}@@ -760,7 +760,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,}if (blobContent == null) {- for (BlobRendererer contribution: OneDev.getExtensions(BlobRendererer.class)) {+ for (BlobRenderer contribution: OneDev.getExtensions(BlobRenderer.class)) {blobContent = contribution.render(BLOB_CONTENT_ID, this);if (blobContent != null)break;@@ -1050,7 +1050,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,FileMode.REGULAR_FILE.getBits());State state = new State(blobIdent);state.commentId = comment.getId();- state.position = BlobRendererer.getSourcePosition(comment.getMark().getRange());+ state.position = BlobRenderer.getSourcePosition(comment.getMark().getRange());return state;}@@ -1276,7 +1276,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic void onCommentOpened(AjaxRequestTarget target, CodeComment comment, PlanarRange range) {state.commentId = comment.getId();- state.position = BlobRendererer.getSourcePosition(range);+ state.position = BlobRenderer.getSourcePosition(range);pushState(target);}@@ -1290,7 +1290,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic void onAddComment(AjaxRequestTarget target, PlanarRange range) {state.commentId = null;- state.position = BlobRendererer.getSourcePosition(range);+ state.position = BlobRenderer.getSourcePosition(range);pushState(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.javarename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.javaindex 77af75f6cf..2f166ae3fb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderer.java@@ -10,9 +10,9 @@ import io.onedev.commons.loader.ExtensionPoint;import io.onedev.commons.utils.PlanarRange;@ExtensionPoint-public interface BlobRendererer extends Serializable {+public interface BlobRenderer extends Serializable {- static final String SOURCE_POSITION_PREFIX = "source-";+ public static final String SOURCE_POSITION_PREFIX = "source-";@Nullablepublic static PlanarRange getSourceRange(@Nullable String position) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.javaindex 5b34b8689f..2a8e41d34b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java@@ -14,9 +14,9 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;-public class BuildSpecRenderer implements BlobRendererer {+public class BuildSpecRenderer implements BlobRenderer {private static final long serialVersionUID = 1L;@@ -63,14 +63,14 @@ public class BuildSpecRenderer implements BlobRendererer {public Component render(String componentId, BlobRenderContext context) {if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath())|| context.getMode() == Mode.EDIT && isBuildSpec(context.getBlobIdent().path)) {- if (BlobRendererer.getSourceRange(context.getPosition()) != null)+ if (BlobRenderer.getSourceRange(context.getPosition()) != null)return new SourceEditPanel(componentId, context);elsereturn new BuildSpecBlobEditPanel(componentId, context);} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()&& isBuildSpec(context.getBlobIdent().path)) {- if (BlobRendererer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)+ if (BlobRenderer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)return new SourceViewPanel(componentId, context, false);else if (context.isViewPlain())return new SourceViewPanel(componentId, context, true);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.javaindex 0acd6227cf..d8666c4cd5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java@@ -4,9 +4,9 @@ import org.apache.wicket.Component;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;-public class GitLinkRenderer implements BlobRendererer {+public class GitLinkRenderer implements BlobRenderer {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.javaindex 3a70231e53..4e35bcbd94 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java@@ -4,9 +4,9 @@ import org.apache.wicket.Component;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;-public class ImageRenderer implements BlobRendererer {+public class ImageRenderer implements BlobRenderer {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.javaindex dabf6c6337..af41948a5c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java@@ -9,10 +9,10 @@ import io.onedev.server.util.FileExtension;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@SuppressWarnings("serial")-public class MarkdownRenderer implements BlobRendererer {+public class MarkdownRenderer implements BlobRenderer {private boolean isMarkdown(@Nullable String blobPath) {String language = ProgrammingLanguageDetector.getLanguageForExtension(FileExtension.getExtension(blobPath));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.javaindex 05c21daf1c..9d7328a0fb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java@@ -4,9 +4,9 @@ import org.apache.wicket.Component;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;-public class SymbolLinkRenderer implements BlobRendererer {+public class SymbolLinkRenderer implements BlobRenderer {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.javaindex fe2d6ac27c..84f0aa7fa9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java@@ -4,9 +4,9 @@ import org.apache.wicket.Component;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;-public class VideoRenderer implements BlobRendererer {+public class VideoRenderer implements BlobRenderer {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.javaindex 54678c8826..3959155e75 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java@@ -15,7 +15,7 @@ import io.onedev.server.OneDev;import io.onedev.server.web.component.sourceformat.OptionChangeCallback;import io.onedev.server.web.component.sourceformat.SourceFormatPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;import io.onedev.server.web.page.project.blob.render.view.Positionable;@@ -82,7 +82,7 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));- PlanarRange mark = BlobRendererer.getSourceRange(context.getPosition());+ PlanarRange mark = BlobRenderer.getSourceRange(context.getPosition());String script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s);",getEditor().getMarkupId(), mark != null? getJson(mark): "undefined");@@ -100,7 +100,7 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {@Overridepublic void position(AjaxRequestTarget target, String position) {String script;- PlanarRange mark = BlobRendererer.getSourceRange(position);+ PlanarRange mark = BlobRenderer.getSourceRange(position);if (mark != null)script = String.format("onedev.server.sourceEdit.mark(%s);", getJson(mark));elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.javaindex fe32d98c90..4584cdc60b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java@@ -20,7 +20,7 @@ import io.onedev.server.util.ContentDetector;import io.onedev.server.web.component.sourceformat.SourceFormatPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@SuppressWarnings("serial")abstract class SourceFormComponent extends FormComponentPanel<byte[]> {@@ -69,7 +69,7 @@ abstract class SourceFormComponent extends FormComponentPanel<byte[]> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- PlanarRange mark = BlobRendererer.getSourceRange(getContext().getPosition());+ PlanarRange mark = BlobRenderer.getSourceRange(getContext().getPosition());String jsonOfMark;if (mark != null) {try {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex ca345b53f3..d6bd433658 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -115,7 +115,7 @@ import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;import io.onedev.server.web.page.project.blob.render.view.Positionable;import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;@@ -342,7 +342,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overridepublic void onClick(AjaxRequestTarget target) {PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();- String position = BlobRendererer.getSourcePosition(range);+ String position = BlobRenderer.getSourcePosition(range);position(target, position);context.onPosition(target, position);target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));@@ -483,7 +483,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searcase "openSelectionPopover":PlanarRange range = getRange(params, "param1", "param2", "param3", "param4");- String position = BlobRendererer.getSourcePosition(range);+ String position = BlobRenderer.getSourcePosition(range);String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s);",convertToJson(range), context.getPositionUrl(position), SecurityUtils.getUser()!=null);target.appendJavaScript(script);@@ -792,7 +792,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overridepublic void onClick(AjaxRequestTarget target) {context.onSelect(target, context.getBlobIdent(),- BlobRendererer.getSourcePosition(symbol.getPosition()));+ BlobRenderer.getSourcePosition(symbol.getPosition()));}};@@ -819,7 +819,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent blobIdent = new BlobIdent(getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- context.onSelect(target, blobIdent, BlobRendererer.getSourcePosition(hit.getTokenPos()));+ context.onSelect(target, blobIdent, BlobRenderer.getSourcePosition(hit.getTokenPos()));}@Override@@ -971,7 +971,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searexplicit("action"), explicit("param1"), explicit("param2"),explicit("param3"), explicit("param4"), explicit("param5"));- PlanarRange markRange = BlobRendererer.getSourceRange(context.getPosition());+ PlanarRange markRange = BlobRenderer.getSourceRange(context.getPosition());if (markRange == null)markRange = (PlanarRange) commentContainer.getDefaultModelObject();else@@ -1027,7 +1027,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overridepublic void position(AjaxRequestTarget target, String position) {String script;- PlanarRange mark = BlobRendererer.getSourceRange(position);+ PlanarRange mark = BlobRenderer.getSourceRange(position);if (mark != null)script = String.format("onedev.server.sourceView.mark(%s, true);", convertToJson(mark));else@@ -1091,7 +1091,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overridepublic void onClick(AjaxRequestTarget target) {modal.close();- context.onSelect(target, context.getBlobIdent(), BlobRendererer.getSourcePosition(symbol.getPosition()));+ context.onSelect(target, context.getBlobIdent(), BlobRenderer.getSourcePosition(symbol.getPosition()));}};@@ -1258,9 +1258,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searreturn new SuggestionSupport() {@Override- public SuggestFor getSuggestFor() {+ public Selection getSelection() {return context.getProject().getBlob(mark.getBlobIdent(), true).getText()- .getSuggestFor(mark.getPath(), mark.getRange());+ .getSelection(mark.getRange());}@Override@@ -1307,6 +1307,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searpublic boolean isOutdated() {return false;}++ @Override+ public String getFileName() {+ return mark.getPath();+ }};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex d0b77a58bd..d41507c051 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -48,7 +48,7 @@ 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.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@SuppressWarnings("serial")public abstract class QuickSearchPanel extends Panel {@@ -261,7 +261,7 @@ public abstract class QuickSearchPanel extends Panel {BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);link.add(AttributeAppender.replace("href", url.toString()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex d85d1d8518..63a5c853fd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -41,7 +41,7 @@ import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@SuppressWarnings("serial")public abstract class SearchResultPanel extends Panel {@@ -156,7 +156,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- context.onSelect(target, selected, BlobRendererer.getSourcePosition(hit.getTokenPos()));+ context.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getTokenPos()));}private String getActiveBlobPath(ActiveIndex activeIndex) {@@ -546,7 +546,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 76bb4df3fe..a143a6bc9a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -165,6 +165,7 @@<wicket:svg href="gear" class="icon icon-sm"></wicket:svg></div><div wicket:id="body" class="body d-flex align-items-center"></div>+ <span wicket:id="labelsHelp" class="form-text font-size-sm text-muted"><wicket:svg href="bulb" class="icon icon-sm"/> Labels can be defined in Administration / Label Management</span></div><div wicket:id="watches" class="watches"></div><div wicket:id="reference"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 6e4458d5a0..48b3ef6aae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -916,6 +916,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRlabelsContainer.add(new WebMarkupContainer("head"));}labelsContainer.add(new EntityLabelsPanel<PullRequestLabel>("body", requestModel));+ labelsContainer.add(new WebMarkupContainer("labelsHelp")+ .setVisible(SecurityUtils.canModify(getPullRequest())));fragment.add(labelsContainer);fragment.add(new ReferencePanel("reference") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex c07c60915f..88abf6b0ef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -371,7 +371,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev});- DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits", false, new AlignPlacement(50, 100, 50, 0), true) {+ DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits", false, new AlignPlacement(50, 100, 50, 0), true, false) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {diff --git a/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.javaindex 42a4c3948a..ae10148c6b 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editablebean/LabelsBean.java@@ -5,16 +5,11 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.LabelManager;import io.onedev.server.model.support.LabelSupport;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.page.admin.labelmanagement.LabelManagementPage;@Editablepublic class LabelsBean implements Serializable {@@ -23,7 +18,7 @@ public class LabelsBean implements Serializable {private List<String> labels = new ArrayList<>();- @Editable(descriptionProvider="getLabelsDescription")+ @Editable(description="Labels can be defined in Administration / Label Management")@ChoiceProvider("getLabelChoices")public List<String> getLabels() {return labels;@@ -39,16 +34,6 @@ public class LabelsBean implements Serializable {return labels.stream().map(it->it.getName()).sorted().collect(Collectors.toList());}- @SuppressWarnings("unused")- private static String getLabelsDescription() {- if (SecurityUtils.isAdministrator()) {- CharSequence url = RequestCycle.get().urlFor(LabelManagementPage.class, new PageParameters());- return String.format("Labels can be defined in <a href='%s' target='_blank'>Administration / Label Management</a>", url);- } else {- return "Labels can be defined in Administration / Label Management";- }- }-public static LabelsBean of(LabelSupport<?> labelSupport) {LabelsBean bean = new LabelsBean();labelSupport.getLabels().stream()diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.javaindex 10507f12f9..3e9ec4fa68 100644--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java@@ -37,7 +37,7 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;@Editable(order=8030, group=StepGroup.PUBLISH_REPORTS, name="CPD")public class PublishCPDReportStep extends PublishProblemReportStep {@@ -112,7 +112,7 @@ public class PublishCPDReportStep extends PublishProblemReportStep {ProjectBlobPage.State state = new ProjectBlobPage.State();state.blobIdent = new BlobIdent();state.problemReport = getReportName();- state.position = BlobRendererer.getSourcePosition(duplicateWith.range);+ state.position = BlobRenderer.getSourcePosition(duplicateWith.range);params.set(0, build.getCommitHash());List<String> pathSegments = Splitter.on("/").splitToList(duplicateWith.blobPath);diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.javaindex 67e62b0d80..cacc51079e 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportParser.java@@ -26,7 +26,7 @@ import io.onedev.server.plugin.report.unittest.UnitTestReport.TestSuite;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.StringTransformer;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;public class JestReportParser {@@ -125,7 +125,7 @@ public class JestReportParser {ProjectBlobPage.State state = new ProjectBlobPage.State();state.blobIdent = blobIdent;PlanarRange range = new PlanarRange(line-1, col-1, line-1, col);- state.position = BlobRendererer.getSourcePosition(range);+ state.position = BlobRenderer.getSourcePosition(range);PageParameters params = ProjectBlobPage.paramsOf(build.getProject(), state);String url = RequestCycle.get().urlFor(ProjectBlobPage.class, params).toString();return String.format("(<a href='%s'>%s:%d:%d</a>)", url, HtmlEscape.escapeHtml5(file), line, col);diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.javaindex 418ef270df..a5fdff8f5d 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java@@ -57,7 +57,7 @@ import io.onedev.server.web.component.NoRecordsPlaceholder;import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRendererer;+import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.builds.detail.report.BuildReportPage;import io.onedev.server.web.util.SuggestionUtils;@@ -271,7 +271,7 @@ public class ProblemReportPage extends BuildReportPage {state.blobIdent = new BlobIdent(getBuild().getCommitHash(),filePath, FileMode.REGULAR_FILE.getBits());state.problemReport = getReportName();- state.position = BlobRendererer.getSourcePosition(problem.getRange());+ state.position = BlobRenderer.getSourcePosition(problem.getRange());PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",ProjectBlobPage.class, params);