Skip to content

The Unified and Autonomous Development Platform

fix issue #106: Code comment does not jump to corresponding code block

Robin Shena76aeef50564
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
index 9f6e2f1def..79acdd4dd9 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -23,7 +23,7 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
@Override
public String getActivity(boolean withEntity) {
- String activity = "replied code comment on file '" + getComment().getMarkPos().getPath() + "'";
+ String activity = "replied code comment";
if (withEntity)
activity += " in pull request " + getRequest().describe();
return activity;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js
index c148ed42f7..f699fa4ae2 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js
@@ -17,15 +17,7 @@ onedev.server.codemirror = {
},
scrollTo: function(cm, mark) {
var top = cm.charCoords({line: mark.fromRow, ch: 0}, "local").top;
- var bottom = cm.charCoords({line: mark.toRow, ch: 0}, "local").bottom;
-
- var markHeight = bottom - top;
- var clientHeight = cm.getScrollInfo().clientHeight;
- if (clientHeight <= markHeight) {
- cm.scrollTo(null, top - 50);
- } else {
- cm.scrollTo(null, (top+bottom-clientHeight)/2);
- }
+ cm.scrollTo(null, top - 50);
},
setModeByName: function(cm, modeName) {
var modeInfo = CodeMirror.findModeByName(modeName);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
index 868371b9bd..3707cf249f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
@@ -609,15 +609,8 @@ onedev.server.textDiff = {
var $startTd = markInfo.startTd;
var $endTd = markInfo.endTd;
if ($startTd && $endTd) {
- var top = $startTd.offset().top;
- var bottom = $endTd.offset().top + $endTd.outerHeight();
- var markHeight = bottom - top;
- var windowHeight = $(window).height();
- if (windowHeight <= markHeight) {
- $(window).scrollTop(top-50);
- } else {
- $(window).scrollTop((top+bottom-windowHeight)/2);
- }
+ var $scrollParent = $startTd.scrollParent();
+ $scrollParent.scrollTop($startTd.offset().top - $scrollParent.offset().top + $scrollParent.scrollTop()-50);
}
},
mark: function($container, mark) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index 5eaf9a72df..87410eac65 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -4,7 +4,8 @@
<img wicket:id="icon">
<span>Revisions indexing in progress... (symbol navigation in revisions will be accurate after indexed)</span>
</div>
- <table class="head">
+ <!-- disable auto focus here as otherwise we have problems jumping to marked code blocks -->
+ <table class="head no-autofocus">
<tr>
<td class="view-mode">
<span class="btn-group">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
index 243311f2c7..3e35bd7529 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
@@ -122,10 +122,6 @@
.revision-diff>.body>.detail>.comment>.content>.head .locate {
font-size: 20px;
}
-.revision-diff>.body>.detail>.comment>.content>.head .permanent {
- margin-top: 2px;
- font-size: 18px;
-}
.revision-diff>.body>.detail>.comment>.content>.head .context {
margin-top: -2px;
}
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.js
index 2a7d6ca340..5922ce5aee 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
@@ -37,9 +37,11 @@ onedev.server.revisionDiff = {
if (window.location.hash) {
var $anchor = $(window.location.hash);
if ($anchor.length != 0) {
- var detailOffset = $(".revision-diff>.body>.detail").offset().top;
- if ($(window).scrollTop() <= detailOffset)
- $(window).scrollTop(detailOffset);
+ var $detail = $(".revision-diff>.body>.detail");
+ var $scrollParent = $detail.scrollParent();
+ var detailOffset = $detail.offset().top - $scrollParent.offset().top;
+ if ($scrollParent.scrollTop() < detailOffset)
+ $scrollParent.scrollTop(detailOffset);
$anchor[0].scrollIntoView();
}
}
@@ -69,43 +71,32 @@ onedev.server.revisionDiff = {
var $detail = $(".revision-diff>.body>.detail");
var $comment = $detail.children(".comment");
var $diffs = $detail.children(".diffs");
- var windowHeight;
if ($comment.is(":visible")) {
- windowHeight = $(window).height();
+ var $scrollParent = $detail.scrollParent();
+ var scrollParentHeight = $scrollParent[0].clientHeight;
+ var scrollParentTop = $scrollParent.offset().top;
$detail.css("padding-left", $comment.outerWidth(true));
- var scrollLeft = $(window).scrollLeft();
- var scrollTop = $(window).scrollTop();
- $comment.css("left", $detail.offset().left - scrollLeft);
- var topOffset = $diffs.offset().top - scrollTop;
- var headHeight = $("#layout>.navbar").outerHeight();
- if (topOffset <= headHeight) {
- $comment.css("top", headHeight);
- } else {
- $comment.css("top", topOffset);
- }
+ $comment.css("left", $detail.offset().left);
+ var diffsTop = $diffs.offset().top;
+ var commentTop;
+ if (diffsTop <= scrollParentTop)
+ commentTop = scrollParentTop;
+ else
+ commentTop = diffsTop;
+ $comment.css("top", commentTop);
var $lastDiff = $diffs.children().last();
- var commentHeight;
- if ($lastDiff.length != 0) {
- commentHeight = $lastDiff.offset().top + $lastDiff.height() - scrollTop - headHeight;
- } else {
- commentHeight = $diffs.offset().top + $diffs.height() - scrollTop - headHeight;
- }
- var maxCommentHeight = windowHeight - headHeight;
- var minCommentHeight = maxCommentHeight - 20;
- if (commentHeight < minCommentHeight)
- commentHeight = minCommentHeight;
- else if (commentHeight > maxCommentHeight)
- commentHeight = maxCommentHeight;
+ var commentHeight = scrollParentTop + scrollParentHeight - commentTop;
var $commentResizeHandle = $comment.children(".ui-resizable-handle");
$commentResizeHandle.outerHeight(commentHeight - 2);
var $commentHead = $comment.find(">.content>.head");
$comment.find(">.content>.body").outerHeight(commentHeight-2-$commentHead.outerHeight());
+ var diffsHeight = $diffs.outerHeight();
+ var windowHeight = $(window).height();
+ $detail.height(windowHeight>diffsHeight?windowHeight:diffsHeight);
} else {
- windowHeight = 0;
$detail.css("padding-left", "0");
+ $detail.height($diffs.outerHeight());
}
- var diffsHeight = $diffs.outerHeight();
- $detail.height(windowHeight>diffsHeight?windowHeight:diffsHeight);
},
initComment: function() {
var $comment = $(".revision-diff>.body>.detail>.comment");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
index a0fba890c7..6fa91f1694 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="commit-detail">
+ <div id="commit-detail" class="resize-aware">
<div class="info">
<div class="message">
<div class="subject clearfix">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 130f8d4ef6..c02d50715e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -204,7 +204,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- String script = String.format("onedev.server.commitdetail.initRefs('%s');", getMarkupId());
+ String script = String.format("onedev.server.commitDetail.initRefs('%s');", getMarkupId());
response.render(OnDomReadyHeaderItem.forScript(script));
}
@@ -559,6 +559,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.commitDetail.onDomReady();"));
}
public static PageParameters paramsOf(Project project, State state) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index 4e5719f4b7..44e709a8fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -1,3 +1,11 @@
+body.CommitDetailPage #layout>.body {
+ padding: 50px 0 0 0;
+}
+#commit-detail {
+ position: relative;
+ overflow: auto;
+ padding: 20px;
+}
#commit-detail>div {
margin-bottom: 20px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
index ab443e464a..f94f8922b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.js
@@ -1,4 +1,16 @@
-onedev.server.commitdetail = {
+onedev.server.commitDetail = {
+ onDomReady: function() {
+ $("body").css("overflow", "hidden");
+ var $commitDetail = $("#commit-detail");
+ function adjustHeight() {
+ $commitDetail.outerHeight($(window).height() - $commitDetail.offset().top);
+ }
+ adjustHeight();
+ $commitDetail.on("resized", adjustHeight);
+ $commitDetail.scroll(function() {
+ $commitDetail.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
+ });
+ },
initRefs: function(refsId) {
var $refs = $("#" + refsId);
if ($refs.children().length != 0)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java
deleted file mode 100644
index bfcbec653b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.compare;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class RevisionCompareCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public RevisionCompareCssResourceReference() {
- super(RevisionCompareCssResourceReference.class, "revision-compare.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index d1a74f91c4..2b2699dfa4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -1,53 +1,55 @@
<wicket:extend>
- <div class="page-title">Revision Compare</div>
- <div id="revision-compare">
- <table class="revision-compare">
- <tr>
- <td class="left revision">
- <div class="title clearfix">
- <label class="pull-left">Base</label>
- <wicket:enclosure child="compareWithMergeBase">
- <div class="pull-left checkbox">
- <label>
- <input wicket:id="compareWithMergeBase" type="checkbox">
- common ancestor
- <span wicket:id="mergeBaseTooltip"><i class="fa fa-question-circle"></i></span>
- </label>
+ <div id="revision-compare" class="resize-aware">
+ <div class="page-title">Revision Compare</div>
+ <div class="page-content">
+ <table class="revision-compare">
+ <tr>
+ <td class="left revision">
+ <div class="title clearfix">
+ <label class="pull-left">Base</label>
+ <wicket:enclosure child="compareWithMergeBase">
+ <div class="pull-left checkbox">
+ <label>
+ <input wicket:id="compareWithMergeBase" type="checkbox">
+ common ancestor
+ <span wicket:id="mergeBaseTooltip"><i class="fa fa-question-circle"></i></span>
+ </label>
+ </div>
+ </wicket:enclosure>
</div>
- </wicket:enclosure>
- </div>
- <div wicket:id="leftRevSelector" class="selector"></div>
- <div class="message">
- <a wicket:id="leftCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- <td class="action">
- <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>
- </td>
- <td class="right revision">
- <div class="title">
- <label>Compare</label>
- </div>
- <div wicket:id="rightRevSelector" class="selector"></div>
- <div class="message">
- <a wicket:id="rightCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- </tr>
- </table>
- <div wicket:id="effectiveRequest" class="alert alert-info">
- <span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
- </div>
- <div>
- <a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>
- </div>
- <div wicket:id="revisionNotSpecified" class="alert alert-warning">
- <span>Please select revisions to compare</span>
- </div>
- <div wicket:id="unrelatedHistory" class="alert alert-warning">
- <span>History of comparing revisions is unrelated</span>
+ <div wicket:id="leftRevSelector" class="selector"></div>
+ <div class="message">
+ <a wicket:id="leftCommitLink"><span wicket:id="message"></span></a>
+ </div>
+ </td>
+ <td class="action">
+ <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>
+ </td>
+ <td class="right revision">
+ <div class="title">
+ <label>Compare</label>
+ </div>
+ <div wicket:id="rightRevSelector" class="selector"></div>
+ <div class="message">
+ <a wicket:id="rightCommitLink"><span wicket:id="message"></span></a>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div wicket:id="effectiveRequest" class="alert alert-info">
+ <span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a>
+ </div>
+ <div>
+ <a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>
+ </div>
+ <div wicket:id="revisionNotSpecified" class="alert alert-warning">
+ <span>Please select revisions to compare</span>
+ </div>
+ <div wicket:id="unrelatedHistory" class="alert alert-warning">
+ <span>History of comparing revisions is unrelated</span>
+ </div>
+ <ul wicket:id="tabs" class="nav nav-tabs"></ul>
+ <div wicket:id="tabPanel" class="tab-panel"></div>
</div>
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
- <div wicket:id="tabPanel" class="tab-panel"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index fca1bac48d..72b3cf7342 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -10,8 +10,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.behavior.AttributeAppender;
-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.CheckBox;
@@ -525,8 +526,8 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference()));
- response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new RevisionCompareResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionCompare.onDomReady();"));
}
private void newTabPanel(@Nullable AjaxRequestTarget target) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java
new file mode 100644
index 0000000000..1cd434a007
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java
@@ -0,0 +1,29 @@
+package io.onedev.server.web.page.project.compare;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class RevisionCompareResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public RevisionCompareResourceReference() {
+ super(RevisionCompareResourceReference.class, "revision-compare.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ RevisionCompareResourceReference.class, "revision-compare.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
index 830be0c2a8..9fc8522ad9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
@@ -1,6 +1,14 @@
-#revision-compare>* {
+body.RevisionComparePage #layout>.body {
+ padding: 50px 0 0 0;
+}
+#revision-compare {
+ position: relative;
+ overflow: auto;
+ padding: 20px;
+}
+#revision-compare>.page-content>* {
margin-bottom: 20px;
}
-#revision-compare>:LAST-CHILD {
+#revision-compare>.page-content>:LAST-CHILD {
margin-bottom: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js
new file mode 100644
index 0000000000..fff03aae98
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.js
@@ -0,0 +1,14 @@
+onedev.server.revisionCompare = {
+ onDomReady: function() {
+ $("body").css("overflow", "hidden");
+ var $revisionCompare = $("#revision-compare");
+ function adjustHeight() {
+ $revisionCompare.outerHeight($(window).height() - $revisionCompare.offset().top);
+ }
+ adjustHeight();
+ $revisionCompare.on("resized", adjustHeight);
+ $revisionCompare.scroll(function() {
+ $revisionCompare.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
+ });
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java
deleted file mode 100644
index dda8bb3357..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.create;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class NewPullRequestCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public NewPullRequestCssResourceReference() {
- super(NewPullRequestCssResourceReference.class, "new-pull-request.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index 2667e0caf9..3079e41714 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -1,34 +1,36 @@
<wicket:extend>
- <div class="page-title">New Pull Request</div>
- <div id="new-request">
- <table class="branches revision-compare">
- <tr>
- <td class="target branch revision">
- <div class="title clearfix">
- <label class="pull-left">Target</label>
- </div>
- <div wicket:id="target" class="selector"></div>
- <div class="message">
- <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- <td class="action">
- <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>
- </td>
- <td class="source branch revision">
- <div class="title">
- <label>Source</label>
- </div>
- <div wicket:id="source" class="selector"></div>
- <div class="message">
- <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a>
- </div>
- </td>
- </tr>
- </table>
- <div wicket:id="status" class="status"></div>
- <ul wicket:id="tabs" class="nav nav-tabs"></ul>
- <div wicket:id="tabPanel" class="tab-panel"></div>
+ <div id="new-pull-request" class="resize-aware">
+ <div class="page-title">New Pull Request</div>
+ <div class="page-content">
+ <table class="branches revision-compare">
+ <tr>
+ <td class="target branch revision">
+ <div class="title clearfix">
+ <label class="pull-left">Target</label>
+ </div>
+ <div wicket:id="target" class="selector"></div>
+ <div class="message">
+ <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a>
+ </div>
+ </td>
+ <td class="action">
+ <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>
+ </td>
+ <td class="source branch revision">
+ <div class="title">
+ <label>Source</label>
+ </div>
+ <div wicket:id="source" class="selector"></div>
+ <div class="message">
+ <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div wicket:id="status" class="status"></div>
+ <ul wicket:id="tabs" class="nav nav-tabs"></ul>
+ <div wicket:id="tabPanel" class="tab-panel"></div>
+ </div>
</div>
<wicket:fragment wicket:id="effectiveFrag">
<div class="alert alert-info">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 0e18e825f3..ab23c03dac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -16,8 +16,9 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.Button;
@@ -62,7 +63,6 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
-import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;
@@ -773,8 +773,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
- response.render(CssHeaderItem.forReference(new NewPullRequestCssResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new NewPullRequestResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.newPullRequest.onDomReady();"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java
new file mode 100644
index 0000000000..d2eb8e5690
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java
@@ -0,0 +1,29 @@
+package io.onedev.server.web.page.project.pullrequests.create;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class NewPullRequestResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public NewPullRequestResourceReference() {
+ super(NewPullRequestResourceReference.class, "new-pull-request.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ NewPullRequestResourceReference.class, "new-pull-request.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
index db797c04d9..5a685278fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
@@ -1,89 +1,96 @@
@media(min-width: 360px) {
- #new-request>ul.nav-tabs>li.collapsed {
+ #new-pull-request>.page-content>ul.nav-tabs>li.collapsed {
display: none;
}
- #new-request>ul.nav-tabs>li.expanded {
+ #new-pull-request>ul.nav-tabs>li.expanded {
display: block;
}
}
-
-#new-request>* {
+body.NewPullRequestPage #layout>.body {
+ padding: 50px 0 0 0;
+}
+#new-pull-request {
+ position: relative;
+ overflow: auto;
+ padding: 20px;
+}
+#new-pull-request>.page-content>* {
margin-bottom: 20px;
}
-#new-request>:last-child {
+#new-pull-request>.page-content>:last-child {
margin-bottom: 0;
}
-#new-request>.status .summary {
+#new-pull-request>.page-content>.status .summary {
font-size: 16px;
padding: 0;
margin-bottom: 8px;
}
-#new-request>.status>.can-send form>table>tbody>tr>td {
+#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td {
padding: 16px 0;
border-top: 1px dashed #BBB;
border-bottom: 1px dashed #BBB;
}
-#new-request>.status>.can-send form>table>tbody>tr>td.name {
+#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.name {
width: 200px;
font-size: 18px;
padding-right: 8px;
}
-#new-request>.status>.can-send form>table>tbody>tr>td.value {
+#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.value {
padding-left: 8px;
}
-#new-request>.status>.can-send form>table {
+#new-pull-request>.page-content>.status>.can-send form>table {
margin-bottom: 16px;
}
-#new-request>.status>.can-send form>table>tbody>tr>td.name .required:BEFORE {
+#new-pull-request>.page-content>.status>.can-send form>table>tbody>tr>td.name .required:BEFORE {
content: "*";
color: red;
}
-#new-request table.reviewers {
+#new-pull-request>.page-content table.reviewers {
width: auto;
}
-#new-request>.status>.can-send form .alert-danger {
+#new-pull-request>.page-content>.status>.can-send form .alert-danger {
margin-bottom: 0;
margin-top: 16px;
}
-#new-request>.status>.can-send form .help-block {
+#new-pull-request>.page-content>.status>.can-send form .help-block {
margin-bottom: 0;
}
-#new-request>.status>.can-send form select {
+#new-pull-request>.page-content>.status>.can-send form select {
width: auto;
}
-#new-request>.status>.can-send table.reviews td.result {
+#new-pull-request>.page-content>.status>.can-send table.reviews td.result {
display: none;
}
-#new-request>.nav-tabs {
+#new-pull-request>.page-content>.nav-tabs {
margin-bottom: 20px;
}
-#new-request>.tab-panel>.diff-option {
+#new-pull-request>.page-content>.tab-panel>.diff-option {
padding: 8px;
background: #F2F2F2;
border: 1px solid #DDD;
z-index: 200;
margin-bottom: 16px;
}
-#new-request>.status>.can-send .merge-strategy .status {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .status {
margin-top: 10px;
font-size: 16px;
font-weight: bold;
}
-#new-request>.status>.can-send .merge-strategy .status .no-conflict {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .no-conflict {
color: #399529;
}
-#new-request>.status>.can-send .merge-strategy .status .conflict {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .conflict {
color: #DD4B4B;
}
-#new-request>.status>.can-send .merge-strategy .status .calculating {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .calculating {
color: #BC7E12;
}
-#new-request>.status>.can-send .merge-strategy .status .calculating img {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .status .calculating img {
width: 24px;
height: 24px;
}
-#new-request>.status>.can-send .merge-strategy .merge-without-review {
+#new-pull-request>.page-content>.status>.can-send .merge-strategy .merge-without-review {
margin-top: 20px;
margin-bottom: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
new file mode 100644
index 0000000000..502a87c988
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.js
@@ -0,0 +1,14 @@
+onedev.server.newPullRequest = {
+ onDomReady: function() {
+ $("body").css("overflow", "hidden");
+ var $newPullRequest = $("#new-pull-request");
+ function adjustHeight() {
+ $newPullRequest.outerHeight($(window).height() - $newPullRequest.offset().top);
+ }
+ adjustHeight();
+ $newPullRequest.on("resized", adjustHeight);
+ $newPullRequest.scroll(function() {
+ $newPullRequest.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
+ });
+ }
+}
\ No newline at end of file
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.html
index c98890fc0e..4877f161bb 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
@@ -1,6 +1,6 @@
<wicket:extend>
<div id="request-detail">
- <div class="main">
+ <div class="main resize-aware">
<div wicket:id="requestHead" class="title clearfix">
<span class="pull-left">
<span wicket:id="title" class="title"></span>
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.css
index b66e2a109a..4640af880d 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
@@ -19,6 +19,9 @@ body.PullRequestDetailPage #layout>.body {
#request-detail>.main>div {
margin-bottom: 20px;
}
+#request-detail>.main>div:last-child {
+ margin-bottom: 0;
+}
#request-detail>.main>.title {
font-size: 20px;
font-weight: bold;
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.js
index 290d2a67eb..4fdd4f41cb 100644
--- 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.js
@@ -6,7 +6,7 @@ onedev.server.pullRequestDetail = {
$main.outerHeight($(window).height() - $main.offset().top);
}
adjustHeight();
- $main.addClass("resize-aware").on("resized", adjustHeight);
+ $main.on("resized", adjustHeight);
$main.scroll(function() {
$main.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");
});