The Unified and Autonomous Development Platform
fix issue #46: Jumping to named anchor in markdown sometimes does not work
Robin Shen1c9a990b3f74
diff --git a/pom.xml b/pom.xmlindex a4ec4b0d20..1bac8796b7 100644--- a/pom.xml+++ b/pom.xml@@ -570,7 +570,7 @@</repository></repositories><properties>- <commons.version>1.1.10</commons.version>+ <commons.version>1.1.11</commons.version><slf4j.version>1.7.5</slf4j.version><logback.version>1.0.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex a9e42cece7..234db7ca85 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -325,7 +325,7 @@<dependency><groupId>io.onedev</groupId><artifactId>k8s-helper</artifactId>- <version>1.0.8</version>+ <version>1.0.9</version></dependency></dependencies><properties>diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.javanew file mode 100644index 0000000000..8fe86cc9bc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java@@ -0,0 +1,90 @@+package io.onedev.server.util.markdown;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.lib.ObjectId;+import org.jsoup.nodes.Document;+import org.jsoup.nodes.Element;+import org.jsoup.nodes.Node;+import org.jsoup.select.NodeTraversor;+import org.jsoup.select.NodeVisitor;++import com.google.common.base.Splitter;++import io.onedev.commons.jsyntax.TokenUtils;+import io.onedev.commons.jsyntax.Tokenized;+import io.onedev.commons.jsyntax.Tokenizer;+import io.onedev.commons.jsyntax.TokenizerRegistry;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.web.page.project.commits.CommitDetailPage;++public class CodeProcessor implements MarkdownProcessor {++ protected String toHtml(Project project, ObjectId commitId) {+ CharSequence url = RequestCycle.get().urlFor(+ CommitDetailPage.class, CommitDetailPage.paramsOf(project, commitId.name()));+ return String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>", url, commitId.name(),+ GitUtils.abbreviateSHA(commitId.name()));+ }++ @Override+ public void process(@Nullable Project project, Document rendered, Object context) {+ Collection<Element> codeElements = new ArrayList<>();+ new NodeTraversor(new NodeVisitor() {++ @Override+ public void head(Node node, int depth) {+ }++ @Override+ public void tail(Node node, int depth) {+ if (node instanceof Element) {+ Element element = (Element) node;+ if (element.tagName().equals("code")+ && element.parent() != null+ && element.parent().tagName().equals("pre")) {+ codeElements.add(element);+ }+ }+ }++ }).traverse(rendered);++ for (Element codeElement: codeElements) {+ String code = codeElement.html();++ String language = null;+ String cssClasses = codeElement.attr("class");+ for (String cssClass: Splitter.on(" ").trimResults().omitEmptyStrings().split(cssClasses)) {+ if (cssClass.startsWith("language-")) {+ language = cssClass.substring("language-".length());+ break;+ }+ }++ Tokenizer tokenizer = null;+ if (language != null)+ tokenizer = TokenizerRegistry.getTokenizerByMode(language);++ if (tokenizer != null) {+ List<String> lines = Splitter.on("\n").splitToList(code);+ StringBuilder highlighted = new StringBuilder();+ for (Tokenized tokenized: tokenizer.tokenize(lines)) {+ for (long token: tokenized.getTokens())+ highlighted.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));+ highlighted.append("\n");+ }+ codeElement.html(highlighted.toString());+ }+ codeElement.addClass("cm-s-eclipse").parent().addClass("highlight");+ }++ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.javaindex 2b5fbb29d0..d3aa59e07b 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java@@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableSet;import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.TextNodeVisitor;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -36,33 +35,31 @@ public class CommitProcessor implements MarkdownProcessor {@Overridepublic void process(@Nullable Project project, Document rendered, Object context) {- if (project != null && SecurityUtils.canReadCode(project)) {- TextNodeVisitor visitor = new TextNodeVisitor() {-- @Override- protected boolean isApplicable(TextNode node) {- return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);- }- };-- NodeTraversor tranversor = new NodeTraversor(visitor);- tranversor.traverse(rendered);+ TextNodeVisitor visitor = new TextNodeVisitor() {- for (TextNode node : visitor.getMatchedNodes()) {- Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());- while (matcher.find()) {- String commitHash = matcher.group(2);- String commitTag;- ObjectId commitId = ObjectId.fromString(commitHash);- if (project.getRevCommit(commitId, false) != null) {- commitTag = toHtml(project, commitId);- } else {- commitTag = commitId.name();- }- HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitTag + matcher.group(3));+ @Override+ protected boolean isApplicable(TextNode node) {+ return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);+ }+ };++ NodeTraversor tranversor = new NodeTraversor(visitor);+ tranversor.traverse(rendered);++ for (TextNode node : visitor.getMatchedNodes()) {+ Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());+ while (matcher.find()) {+ String commitHash = matcher.group(2);+ String commitTag;+ ObjectId commitId = ObjectId.fromString(commitHash);+ if (project.getRevCommit(commitId, false) != null) {+ commitTag = toHtml(project, commitId);+ } else {+ commitTag = commitId.name();}- HtmlUtils.appendTail(matcher, node);+ HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitTag + matcher.group(3));}+ HtmlUtils.appendTail(matcher, node);}}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.javaindex 2987f250c0..61a26df4bb 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java@@ -48,7 +48,6 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "simplescrollbars.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "gotoline.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "identifier-highlighter.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "highlight.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "loadmode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/mode/meta.js")));dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));@@ -63,7 +62,6 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/search/matchesonscrollbar.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/display/fullscreen.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/hint/show-hint.css")));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeMirrorResourceReference.class, "highlight.css")));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeMirrorResourceReference.class, "codemirror.css")));return dependencies;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.cssdeleted file mode 100644index 3b72636bf6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.css+++ /dev/null@@ -1,19 +0,0 @@-pre.highlight {- padding: 8px;- border: 1px dashed #BBB;- background: #F9F9F9;-}-pre.highlight>code>.CodeMirror {- height: auto;- background: #F9F9F9;-}-pre.highlight>code>.CodeMirror .CodeMirror-cursor {- border-left: none;-}--pre.highlight>code>.CodeMirror .CodeMirror-simplescroll-horizontal {- height: 6px;-}-pre.highlight>code>.CodeMirror .CodeMirror-simplescroll-vertical {- width: 6px;-}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.jsdeleted file mode 100644index 98ba86ac10..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/highlight.js+++ /dev/null@@ -1,28 +0,0 @@-onedev.server.highlight = function($container) {- $container.find("pre>code").each(function() {- var $this = $(this);- $this.parent().addClass("highlight");- var text = $this.text().trim();- $this.empty();- var cm = CodeMirror(this, {- readOnly: onedev.server.util.isDevice()?"nocursor":true,- value: text,- highlightIdentifiers: {delay: 500},- theme: "eclipse",- scrollbarStyle: "simple",- matchBrackets: true- });- var modeHint = $this.attr("class");- if (modeHint) {- if (modeHint.indexOf("language-") == 0)- modeHint = modeHint.substring("language-".length);- var modeInfo = CodeMirror.findModeByExtension(modeHint);- if (!modeInfo)- modeInfo = CodeMirror.findModeByName(modeHint);- if (modeInfo) {- cm.setOption("mode", modeInfo.mime);- CodeMirror.autoLoadMode(cm, modeInfo.mode);- }- }- });-};\ No newline at end of filediff --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 ae87d1aad0..250dc1d143 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@@ -28,6 +28,7 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;@@ -483,6 +484,7 @@ public class RevisionDiffPanel extends Panel {super.renderHead(response);response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.onDomReady();"));+ response.render(OnLoadHeaderItem.forScript("onedev.server.revisionDiff.onWindowLoad();"));}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.jsindex bb998679c3..8634d1d8aa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js@@ -29,18 +29,17 @@ onedev.server.revisionDiff = {}});}-+onedev.server.revisionDiff.reposition();+ },+ onWindowLoad: function() {if (window.location.hash) {var $anchor = $(window.location.hash);if ($anchor.length != 0) {- setTimeout(function() {- var detailOffset = $(".revision-diff>.body>.detail").offset().top;- if ($(window).scrollTop() <= detailOffset) {- $(window).scrollTop(detailOffset);- }- $anchor.closest(".code-comment").parent().jumpIntoView($anchor);- }, 100);+ var detailOffset = $(".revision-diff>.body>.detail").offset().top;+ if ($(window).scrollTop() <= detailOffset)+ $(window).scrollTop(detailOffset);+ $anchor[0].scrollIntoView();}}},diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.javaindex 403c020771..d707252462 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;import io.onedev.server.web.asset.atwho.AtWhoResourceReference;import io.onedev.server.web.asset.caret.CaretResourceReference;import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;@@ -14,6 +15,7 @@ import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;+import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;@@ -38,10 +40,12 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));dependencies.add(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(MarkdownResourceReference.class, "markdown.css")));+ dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));return dependencies;}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 b4945f811f..26b6a3aaf9 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@@ -264,16 +264,18 @@ body.fullscreen {.markdown-rendered h4, .markdown-rendered h5, .markdown-rendered h6 {font-weight: bold;}+.markdown-rendered pre.highlight {+ padding: 8px;+ border: 1px dashed #BBB;+ background: #F9F9F9;+ position: relative;+}.markdown-rendered blockquote {font-size: 15px;border-left: 4px solid #ddd;color: #777;padding: 0 16px;}-.markdown-rendered code {- color: #333;- background: rgba(0, 0, 0, 0.04);-}.markdown-rendered img {max-width: 100%;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex fca78cd6e6..e7067c501e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -857,11 +857,14 @@ onedev.server.markdown = {},initRendered: function($rendered) {- // delay highlight to fix the issue that code in markdown can not be- // displayed appropriately in a reopened modal dialog- setTimeout(function() {- onedev.server.highlight($rendered);- }, 0);+ if (!onedev.server.util.isDevice()) {+ $rendered.find("pre.highlight").each(function() {+ var ps = new PerfectScrollbar(this);+ $(this).addClass("resize-aware").on("resized", function() {+ ps.update();+ });+ });+ }$rendered.find("span.header-anchor").parent().addClass("header-anchor");$rendered.find("a.header-anchor").each(function() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.jsindex cc51262de6..11705c80af 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js@@ -1,7 +1,11 @@onedev.server.modal = {onDomReady: function(containerId, closeCallback) {var $modal = $("#" + containerId);+$modal.data("closeCallback", closeCallback);+ $modal.on("shown.bs.modal", function(e) {+ $(window).resize();+ });$modal.data("keydown", function(e) {if (e.keyCode == 27diff --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 c93b8e412c..33e8857832 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@@ -728,6 +728,13 @@ onedev.server = {onedev.server.viewState.getFromViewAndSetToHistory();});*/++ if (location.hash && !onedev.server.viewState.getFromHistory()) {+ // Scroll anchors into view (for instance the markdown headline)+ var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];+ if (element)+ element.scrollIntoView();+ }}};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 d43a2c3978..8d5da86801 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@@ -27,7 +27,6 @@ import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.upload.FileUpload;@@ -872,8 +871,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SString script = String.format("onedev.server.projectBlob.onDomReady(%s);", callback);response.render(OnDomReadyHeaderItem.forScript(script));-- response.render(OnLoadHeaderItem.forScript("onedev.server.projectBlob.onWindowLoad();"));}public static ProjectBlobPage.State getState(CodeComment comment) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.jsindex 297f0fdd35..a9c87a8807 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js@@ -122,13 +122,5 @@ onedev.server.projectBlob = {} else {return 0;}- },- onWindowLoad: function() {- if (location.hash && !onedev.server.viewState.getFromHistory()) {- // Scroll anchors into view (for instance the markdown headline)- var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];- if (element)- element.scrollIntoView();- }}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 08ad84dc5f..036b648d60 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;@@ -181,9 +181,10 @@ abstract class BacklogColumnPanel extends Panel {public void renderHead(IHeaderResponse response) {super.renderHead(response);CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));- String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",+ String script = String.format("onedev.server.issueBoards.onColumnLoad('%s', %s);",getMarkupId(), getQuery()!=null?callback:"undefined");- response.render(OnDomReadyHeaderItem.forScript(script));+ // Use OnLoad instead of OnDomReady as otherwise perfect scrollbar is not shown unless resized+ response.render(OnLoadHeaderItem.forScript(script));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 0b42ead373..784b8ff2a7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -187,9 +187,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {public void renderHead(IHeaderResponse response) {super.renderHead(response);CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));- String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",+ String script = String.format("onedev.server.issueBoards.onColumnLoad('%s', %s);",getMarkupId(), getQuery()!=null?callback:"undefined");- response.render(OnDomReadyHeaderItem.forScript(script));+ // Use OnLoad instead of OnDomReady as otherwise perfect scrollbar is not shown unless resized+ response.render(OnLoadHeaderItem.forScript(script));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex bc500d5c56..a9e51f2cf6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -6,29 +6,25 @@ onedev.server.issueBoards = {if ($body.length != 0) {// Do not use perfect scroll on Device as it may cause scroll issueif (onedev.server.util.isDevice()) {- $(window).resize(function() {+ $body.addClass("resize-aware").on("resized", function() {$body.outerHeight($(window).height()-$body.offset().top);});} else {var ps = new PerfectScrollbar($body[0]);- $(window).resize(function() {+ $body.addClass("resize-aware").on("resized", function() {$body.outerHeight($(window).height()-$body.offset().top);ps.update();});}}},- onColumnDomReady: function(containerId, callback) {+ onColumnLoad: function(containerId, callback) {var $body = $("#" + containerId);// Do not use perfect scroll on Device as it may cause scroll issueif (!onedev.server.util.isDevice()) {var ps = new PerfectScrollbar($body[0]);-- // Scroll bar will not show in the flex box without this line- setTimeout(function() {ps.update();}, 100);-- $(window).resize(function() {+ $body.addClass("resize-aware").on("resized", function() {ps.update();});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.javadeleted file mode 100644index dee4032322..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class IssueDetailCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public IssueDetailCssResourceReference() {- super(IssueDetailCssResourceReference.class, "issue-detail.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex eff0ad8e61..ccd7338f6c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -12,8 +12,9 @@ import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;@@ -253,7 +254,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new IssueDetailCssResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new IssueDetailResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueDetail.onDomReady();"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.javanew file mode 100644index 0000000000..1f2e195d4b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.issues.detail;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class IssueDetailResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueDetailResourceReference() {+ super(IssueDetailResourceReference.class, "issue-detail.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ IssueDetailResourceReference.class, "issue-detail.css")));+ return dependencies;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssindex 00213a811b..0d8380803a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -1,3 +1,11 @@+body.IssueDetailPage #layout>.body {+ padding: 50px 0 0 0;+}+#issue-detail>.main {+ overflow: scroll;+ position: relative;+ padding: 20px;+}#issue-detail>.main>div {margin-bottom: 20px;}@@ -12,7 +20,7 @@@media(min-width: 1150px) {#issue-detail>.main {- padding-right: 360px;+ margin-right: 360px;}#issue-detail .side-info {box-shadow: none;@@ -21,7 +29,7 @@display: block !important;}#issue-detail .issue-operations a.more-info, #issue-detail .side-info>a.close {- display: none;+ display: none !important;}#issue-detail .issue-side .nav {padding-right: 0;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.jsnew file mode 100644index 0000000000..4b7faf0dee--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js@@ -0,0 +1,11 @@+onedev.server.issueDetail = {+ onDomReady: function() {+ $("body").css("overflow", "hidden");+ var $main = $("#issue-detail>.main");+ function adjustHeight() {+ $main.outerHeight($(window).height() - $main.offset().top);+ }+ adjustHeight();+ $main.addClass("resize-aware").on("resized", adjustHeight);+ }+}\ No newline at end of filediff --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 de03ff497b..05a8c474c3 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@@ -47,8 +47,9 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;@@ -1281,7 +1282,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRpublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new PullRequestDetailCssResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onDomReady();"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.javaindex df1742603c..8584d44d46 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailResourceReference.java@@ -7,19 +7,22 @@ import org.apache.wicket.markup.head.HeaderItem;import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class PullRequestDetailCssResourceReference extends BaseDependentCssResourceReference {+public class PullRequestDetailResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public PullRequestDetailCssResourceReference() {- super(PullRequestDetailCssResourceReference.class, "pull-request-detail.css");+ public PullRequestDetailResourceReference() {+ super(PullRequestDetailResourceReference.class, "pull-request-detail.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ PullRequestDetailResourceReference.class, "pull-request-detail.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 247d75ff0c..ef8165384f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -7,6 +7,15 @@}}+body.PullRequestDetailPage #layout>.body {+ padding: 50px 0 0 0;+}+#request-detail>.main {+ overflow: scroll;+ position: relative;+ padding: 20px;+}+#request-detail>.main>div {margin-bottom: 20px;}@@ -191,7 +200,7 @@ ul>li>a.code-comments.new .fa-circle {@media(min-width: 1150px) {#request-detail>.main {- padding-right: 360px;+ margin-right: 360px;}#request-detail .side-info {box-shadow: none;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.jsnew file mode 100644index 0000000000..8e0ecfeb1b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js@@ -0,0 +1,11 @@+onedev.server.pullRequestDetail = {+ onDomReady: function() {+ $("body").css("overflow", "hidden");+ var $main = $("#request-detail>.main");+ function adjustHeight() {+ $main.outerHeight($(window).height() - $main.offset().top);+ }+ adjustHeight();+ $main.addClass("resize-aware").on("resized", adjustHeight);+ }+}\ No newline at end of file