Skip to content

The Unified and Autonomous Development Platform

Scroll page only if necessary when open code comments

Robin Shenbf1c387186ef
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 f699fa4ae2..45d492ab24 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
@@ -19,6 +19,9 @@ onedev.server.codemirror = {
var top = cm.charCoords({line: mark.fromRow, ch: 0}, "local").top;
cm.scrollTo(null, top - 50);
},
+ scrollIntoView: function(cm, mark) {
+ cm.scrollIntoView({line: mark.fromRow, ch: 0}, 8);
+ },
setModeByName: function(cm, modeName) {
var modeInfo = CodeMirror.findModeByName(modeName);
if (modeInfo)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
index a4984770b7..e288c8c27d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java
@@ -10,6 +10,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;
import io.onedev.server.web.component.diff.table.DiffTableResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -28,6 +29,7 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));
dependencies.add(CssHeaderItem.forReference(new DiffTableResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(TextDiffPanel.class, "text-diff.css")));
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 3707cf249f..7e69f5f6ba 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
@@ -613,6 +613,13 @@ onedev.server.textDiff = {
$scrollParent.scrollTop($startTd.offset().top - $scrollParent.offset().top + $scrollParent.scrollTop()-50);
}
},
+ scrollIntoView: function($container, mark) {
+ var markInfo = onedev.server.textDiff.getMarkInfo($container, mark);
+ var $startTd = markInfo.startTd;
+ var $endTd = markInfo.endTd;
+ if ($startTd && $endTd)
+ $startTd.scrollParent().jumpIntoView($startTd);
+ },
mark: function($container, mark) {
onedev.server.textDiff.clearMark($container);
@@ -892,16 +899,22 @@ onedev.server.textDiff = {
onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments);
}
onedev.server.textDiff.highlightCommentTrigger($container);
+ var mark = $container.data("mark");
+ if (mark)
+ onedev.server.textDiff.scrollIntoView($container, mark);
},
onOpenComment: function($container, comment) {
$container.data("openComment", comment);
$container.data("mark", comment.mark);
onedev.server.textDiff.highlightCommentTrigger($container);
onedev.server.textDiff.mark($container, comment.mark);
- onedev.server.textDiff.scrollTo($container, comment.mark);
+ onedev.server.textDiff.scrollIntoView($container, comment.mark);
},
onCloseComment: function($container) {
$container.removeData("openComment");
+ var mark = $container.data("mark");
+ if (mark)
+ onedev.server.textDiff.scrollIntoView($container, mark);
onedev.server.textDiff.highlightCommentTrigger($container);
},
onAddComment: function($container, mark) {
@@ -916,7 +929,7 @@ onedev.server.textDiff = {
setTimeout(function() {
onedev.server.textDiff.highlightCommentTrigger($container);
onedev.server.textDiff.mark($container, mark);
- onedev.server.textDiff.scrollTo($container, mark);
+ onedev.server.textDiff.scrollIntoView($container, mark);
}, 100);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
index 952664d87f..58bc6776c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -442,8 +442,7 @@ onedev.server.sourceView = {
onedev.server.codemirror.clearSelection(cm);
$(window).resize();
- // Mark again to make sure marked text still exists in viewport after layout change
- onedev.server.sourceView.mark(mark);
+ onedev.server.codemirror.scrollIntoView(cm, mark);
onedev.server.sourceView.highlightCommentTrigger();
var $textarea = $sourceView.find(".comment textarea");
@@ -456,9 +455,9 @@ onedev.server.sourceView = {
$sourceView.data("mark", comment.mark);
onedev.server.sourceView.highlightCommentTrigger();
$(window).resize();
-
- // Mark again to make sure marked text still exists in viewport after layout change
- onedev.server.sourceView.mark(comment.mark);
+
+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
+ onedev.server.codemirror.scrollIntoView(cm, comment.mark);
},
onCloseComment: function() {
var $sourceView = $(".source-view");
@@ -521,6 +520,9 @@ onedev.server.sourceView = {
onedev.server.codemirror.scrollTo(cm, mark);
cm.setCursor({line: mark.fromRow, ch: mark.fromColumn});
} else {
+ mark = $(".source-view").data("mark");
+ if (mark)
+ onedev.server.codemirror.scrollIntoView(cm, mark);
$(".source-view").removeData("mark");
onedev.server.codemirror.clearMark(cm);
}