Skip to content

The Unified and Autonomous Development Platform

fix issue #131: Adding code comment in source view does not highlight selected code

Robin Shen8c5e7e6ac78e
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index eae2ee0c63..12b77a0e2d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -474,7 +474,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
public void onClick(AjaxRequestTarget target) {
clearComment(target);
- target.appendJavaScript("onedev.server.sourceView.mark(undefined);");
+ target.appendJavaScript("onedev.server.sourceView.clearMark();");
target.appendJavaScript("$(window).resize();");
context.onPosition(target, null);
}
@@ -958,11 +958,10 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
public void position(AjaxRequestTarget target, String position) {
String script;
PlanarRange mark = SourceRendererProvider.getRange(position);
- if (mark != null) {
- script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));
- } else {
- script = String.format("onedev.server.sourceView.mark(undefined);");
- }
+ if (mark != null)
+ script = String.format("onedev.server.sourceView.mark(%s, true);", getJson(mark));
+ else
+ script = String.format("onedev.server.sourceView.clearMark();");
target.appendJavaScript(script);
}
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 6bf8863d9f..74a5302a74 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
@@ -28,11 +28,8 @@ onedev.server.sourceView = {
$sourceView.data("callback", callback);
$sourceView.data("blameMessageCallback", blameMessageCallback);
- if (mark) {
- onedev.server.codemirror.mark(cm, mark);
- $sourceView.data("mark", mark);
- cm.setCursor({line: mark.fromRow, ch: 0});
- }
+ if (mark)
+ onedev.server.sourceView.mark(mark, false);
if (openComment)
$sourceView.data("openComment", openComment);
@@ -262,11 +259,10 @@ onedev.server.sourceView = {
var $sourceView = $(".source-view");
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
var mark = $sourceView.data("mark");
- if (mark) {
+ if (mark)
onedev.server.codemirror.mark(cm, mark);
- } else {
+ else
onedev.server.codemirror.clearMark(cm);
- }
},
addCommentGutter: function(line, comments) {
$(".comment-popover[data-line='" + line + "']").remove();
@@ -429,7 +425,7 @@ onedev.server.sourceView = {
onedev.server.sourceView.highlightCommentTrigger();
$(window).resize();
- onedev.server.sourceView.mark(undefined);
+ onedev.server.sourceView.clearMark();
},
onAddComment: function(mark) {
onedev.server.sourceView.exitFullScreen();
@@ -442,6 +438,7 @@ onedev.server.sourceView = {
onedev.server.codemirror.clearSelection(cm);
$(window).resize();
+ onedev.server.sourceView.mark(mark, false);
onedev.server.codemirror.scrollIntoView(cm, mark);
onedev.server.sourceView.highlightCommentTrigger();
@@ -464,7 +461,7 @@ onedev.server.sourceView = {
$sourceView.removeData("openComment");
onedev.server.sourceView.highlightCommentTrigger();
$(window).resize();
- onedev.server.sourceView.mark(undefined);
+ onedev.server.sourceView.clearMark();
},
onToggleOutline: function() {
onedev.server.sourceView.exitFullScreen();
@@ -512,20 +509,21 @@ onedev.server.sourceView = {
}
}
},
- mark: function(mark) {
+ mark: function(mark, scroll) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
- if (mark) {
- $(".source-view").data("mark", mark);
- onedev.server.codemirror.mark(cm, mark);
+ $(".source-view").data("mark", mark);
+ onedev.server.codemirror.mark(cm, mark);
+ if (scroll)
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);
- }
+ cm.setCursor({line: mark.fromRow, ch: mark.fromColumn});
+ },
+ clearMark: function() {
+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
+ var mark = $(".source-view").data("mark");
+ if (mark)
+ onedev.server.codemirror.scrollIntoView(cm, mark);
+ $(".source-view").removeData("mark");
+ onedev.server.codemirror.clearMark(cm);
},
blame: function(blameInfos) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;