Skip to content

The Unified and Autonomous Development Platform

chore: Continue to imrove revision diff

Robin Shen2b737bbfff74
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css b/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css
index 1b49b9a145..e6184a1289 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/diff/diff.css
@@ -10,9 +10,11 @@
.text-diff>tbody>tr>td.old.content {
background: #ffecec;
+ border-color: #ffecec;
}
.dark-mode .text-diff>tbody>tr>td.old.content {
background: rgb(49, 16, 20);
+ border-color: rgb(49, 16, 20);
}
.text-diff>tbody>tr>td.old.operation {
background: #ffecec;
@@ -28,9 +30,11 @@
}
.text-diff>tbody>tr>td.new.content {
background: #eaffea;
+ border-color: #eaffea;
}
.dark-mode .text-diff>tbody>tr>td.new.content {
background: rgb(4, 38, 36);
+ border-color: rgb(4, 38, 36);
}
.text-diff>tbody>tr>td.new.operation {
background: #eaffea;
@@ -46,9 +50,11 @@
}
.text-diff>tbody>tr>td.old.new.content {
background: #FCF8E4;
+ border-color: #FCF8E4;
}
.dark-mode .text-diff>tbody>tr>td.old.new.content {
background: rgb(52, 34, 0);
+ border-color: rgb(52, 34, 0);
}
.text-diff>tbody>tr>td.old.new.operation {
background: #FCF8E4;
@@ -59,6 +65,7 @@
.text-diff>tbody>tr>td.content {
white-space: pre-wrap;
word-wrap: break-word;
+ border: 1px solid transparent;
}
.text-diff>tbody>tr>td.operation {
font-weight: bold;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
index 922ff334f9..d3eda7fc9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
@@ -97,7 +97,11 @@ public class BlobDiffPanel extends Panel {
protected PullRequest getPullRequest() {
return BlobDiffPanel.this.getPullRequest();
}
-
+
+ @Override
+ protected void onActivate(AjaxRequestTarget target) {
+ BlobDiffPanel.this.onActivate(target);
+ }
});
}
} else {
@@ -152,6 +156,11 @@ public class BlobDiffPanel extends Panel {
protected PullRequest getPullRequest() {
return BlobDiffPanel.this.getPullRequest();
}
+
+ @Override
+ protected void onActivate(AjaxRequestTarget target) {
+ BlobDiffPanel.this.onActivate(target);
+ }
});
}
@@ -206,4 +215,7 @@ public class BlobDiffPanel extends Panel {
((BlobTextDiffPanel) content).onUnblame(target);
}
+ protected void onActivate(AjaxRequestTarget target) {
+
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 3e35d607c3..548fdf6c84 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -351,67 +351,70 @@ public class BlobTextDiffPanel extends Panel {
protected void respond(AjaxRequestTarget target) {
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
switch (params.getParameterValue("action").toString("")) {
- case "expand":
- if (blameInfo != null) {
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- }
- int index = params.getParameterValue("param1").toInt();
- Integer lastContextSize = contextSizes.get(index);
- if (lastContextSize == null)
- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
- int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
- contextSizes.put(index, contextSize);
-
- StringBuilder builder = new StringBuilder();
- appendEquals(builder, index, lastContextSize, contextSize);
-
- String expanded = StringUtils.replace(builder.toString(), "\n", "");
- String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
- getMarkupId(), index, JavaScriptEscape.escapeJavaScript(expanded));
- target.appendJavaScript(script);
- break;
- case "openSelectionPopover":
- String jsonOfPosition = String.format("{left: %d, top: %d}",
- params.getParameterValue("param1").toInt(),
- params.getParameterValue("param2").toInt());
- DiffPlanarRange commentRange = getRange(params, "param3", "param4", "param5", "param6", "param7");
-
- String markUrl;
- if (change.getAnnotationSupport() != null) {
- markUrl = change.getAnnotationSupport().getMarkUrl(commentRange);
- if (markUrl != null)
- markUrl = "'" + JavaScriptEscape.escapeJavaScript(markUrl) + "'";
- else
+ case "expand":
+ if (blameInfo != null) {
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ }
+ int index = params.getParameterValue("param1").toInt();
+ Integer lastContextSize = contextSizes.get(index);
+ if (lastContextSize == null)
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
+ contextSizes.put(index, contextSize);
+
+ StringBuilder builder = new StringBuilder();
+ appendEquals(builder, index, lastContextSize, contextSize);
+
+ String expanded = StringUtils.replace(builder.toString(), "\n", "");
+ String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
+ getMarkupId(), index, JavaScriptEscape.escapeJavaScript(expanded));
+ target.appendJavaScript(script);
+ break;
+ case "openSelectionPopover":
+ String jsonOfPosition = String.format("{left: %d, top: %d}",
+ params.getParameterValue("param1").toInt(),
+ params.getParameterValue("param2").toInt());
+ DiffPlanarRange commentRange = getRange(params, "param3", "param4", "param5", "param6", "param7");
+
+ String markUrl;
+ if (change.getAnnotationSupport() != null) {
+ markUrl = change.getAnnotationSupport().getMarkUrl(commentRange);
+ if (markUrl != null)
+ markUrl = "'" + JavaScriptEscape.escapeJavaScript(markUrl) + "'";
+ else
+ markUrl = "undefined";
+ } else {
markUrl = "undefined";
- } else {
- markUrl = "undefined";
- }
- script = String.format("onedev.server.blobTextDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",
- getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,
- JavaScriptEscape.escapeJavaScript(getMarkedText(commentRange)),
- SecurityUtils.getAuthUser()!=null);
- target.appendJavaScript(script);
- break;
- case "addComment":
- Preconditions.checkNotNull(SecurityUtils.getAuthUser());
-
- commentRange = getRange(params, "param1", "param2", "param3", "param4", "param5");
- change.getAnnotationSupport().onAddComment(target, commentRange);
- script = String.format("onedev.server.blobTextDiff.onAddComment($('#%s'), %s);",
- getMarkupId(), convertToJson(commentRange));
- target.appendJavaScript(script);
- break;
- case "openComment":
- Long commentId = params.getParameterValue("param1").toLong();
- commentRange = getRange(params, "param2", "param3", "param4", "param5", "param6");
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
- change.getAnnotationSupport().onOpenComment(target, comment, commentRange);
- script = String.format("onedev.server.blobTextDiff.onCommentOpened($('#%s'), %s);",
- getMarkupId(), convertToJson(new DiffCodeCommentInfo(comment, commentRange)));
- target.appendJavaScript(script);
- break;
+ }
+ script = String.format("onedev.server.blobTextDiff.openSelectionPopover('%s', %s, %s, %s, '%s', %s);",
+ getMarkupId(), jsonOfPosition, convertToJson(commentRange), markUrl,
+ JavaScriptEscape.escapeJavaScript(getMarkedText(commentRange)),
+ SecurityUtils.getAuthUser()!=null);
+ target.appendJavaScript(script);
+ break;
+ case "addComment":
+ Preconditions.checkNotNull(SecurityUtils.getAuthUser());
+
+ commentRange = getRange(params, "param1", "param2", "param3", "param4", "param5");
+ change.getAnnotationSupport().onAddComment(target, commentRange);
+ script = String.format("onedev.server.blobTextDiff.onAddComment($('#%s'), %s);",
+ getMarkupId(), convertToJson(commentRange));
+ target.appendJavaScript(script);
+ break;
+ case "openComment":
+ Long commentId = params.getParameterValue("param1").toLong();
+ commentRange = getRange(params, "param2", "param3", "param4", "param5", "param6");
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ change.getAnnotationSupport().onOpenComment(target, comment, commentRange);
+ script = String.format("onedev.server.blobTextDiff.onCommentOpened($('#%s'), %s);",
+ getMarkupId(), convertToJson(new DiffCodeCommentInfo(comment, commentRange)));
+ target.appendJavaScript(script);
+ break;
+ case "setActive":
+ onActivate(target);
+ break;
}
}
@@ -481,6 +484,10 @@ public class BlobTextDiffPanel extends Panel {
return new DiffPlanarRange(leftSide, beginLine, beginChar, endLine, endChar);
}
+ protected void onActivate(AjaxRequestTarget target) {
+
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css
index ca0af46be3..0e6c35e6ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.css
@@ -175,6 +175,9 @@
background: rgb(66, 44, 0);
border-left-color: rgb(103, 68, 0);
}
+.blob-text-diff td.content.active {
+ border: 1px dotted var(--primary) !important;
+}
.blob-text-diff>tbody>tr>td.content>span.content-mark {
background: #8950FC;
color: white !important;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
index 6a7df328eb..5c2477dbe6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
@@ -36,6 +36,11 @@ onedev.server.blobTextDiff = {
}
});
$container.find("td.content").mouseover($container.data("onMouseOverContent"));
+ $container.find("td.content").click(function() {
+ $(".text-diff td.content").removeClass("active");
+ $(this).addClass("active");
+ callback("setActive");
+ });
onedev.server.blobTextDiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash"));
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 b6d73f0715..aecfbaa1cd 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
@@ -10,7 +10,7 @@
<a wicket:id="batchedSuggestions" class="batched-suggestions btn btn-light flex-shrink-0" title="Batched suggestions"><wicket:svg href="diff" class="icon icon-lg mr-2"/> <span wicket:id="count" class="mr-1">3</span><wicket:svg href="arrow" class="icon rotate-90"/></a>
<a wicket:id="option" class="btn btn-light btn-icon btn-lg flex-shrink-0" title="Diff options"><wicket:svg href="gear" class="icon"/></a>
</span>
- <div class="path-filter flex-grow-1 mr-3">
+ <div class="path-filter flex-grow-1">
<form wicket:id="pathFilter">
<div class="clearable-wrapper">
<div class="input-group">
@@ -22,7 +22,7 @@
</div>
</form>
</div>
- <a wicket:id="toggleNavigation" class="btn btn-icon btn-light" title="Toggle navigation"><wicket:svg href="sidebar" class="icon flip-x"/></a>
+ <a wicket:id="toggleNavigation" class="btn btn-icon btn-light btn-active-primary ml-3" title="Toggle navigation"><wicket:svg href="sidebar" class="icon flip-x"/></a>
</div>
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
@@ -41,11 +41,8 @@
</div>
<div class="ui-resizable-handle ui-resizable-e flex-shrink-0"></div>
</div>
- <ul class="diffs list-unstyled flex-grow-1 mb-0">
- <li wicket:id="diffs" class="diff mb-4">
- <div wicket:id="diff"></div>
- </li>
- </ul>
+ <ul class="diffs list-unstyled flex-grow-1 mb-0"><li wicket:id="diffs" class="diff mb-4"><div wicket:id="diff"></div></li></ul>
+ <div wicket:id="noDiffs" class="alert alert-notice alert-light-warning flex-grow-1 mb-0">No diffs</div>
<div wicket:id="navigation" class="navigation need-width border border-left-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky ml-3">
<div class="ui-resizable-handle ui-resizable-w flex-shrink-0"></div>
<div wicket:id="content" class="content flex-grow-1 overflow-auto p-3"></div>
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.java
index 54e8e95bd8..3886487fc6 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
@@ -61,7 +61,6 @@ import io.onedev.server.web.util.RevisionDiff;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
import org.apache.commons.codec.binary.Hex;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -139,6 +138,8 @@ public abstract class RevisionDiffPanel extends Panel {
private DiffViewMode viewMode;
+ private String selectedPath;
+
private final IModel<List<DiffEntryFacade>> diffEntriesModel = new LoadableDetachableModel<>() {
@Override
@@ -338,6 +339,9 @@ public abstract class RevisionDiffPanel extends Panel {
body.replace(commentContainer = newCommentContainer());
body.replace(navigationContainer = newNavigationContainer());
target.add(body);
+ target.appendJavaScript("" +
+ "var $diffs = $('.revision-diff>.body li.diff'); " +
+ "if ($diffs.length != 0) $diffs[0].scrollIntoView();");
}
@Override
@@ -659,9 +663,16 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
toggleNavigation(target);
+ target.add(this);
}
- });
+ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+ @Override
+ public String getObject() {
+ navigationContainer.configure();
+ return navigationContainer.isVisible()? "active": "";
+ }
+ })));
body = new WebMarkupContainer("body") {
@Override
@@ -694,7 +705,7 @@ public abstract class RevisionDiffPanel extends Panel {
});
- body.add(diffsView = new ListView<>("diffs", new AbstractReadOnlyModel<List<BlobChange>>() {
+ body.add(diffsView = new ListView<BlobChange>("diffs", new AbstractReadOnlyModel<>() {
@Override
public List<BlobChange> getObject() {
@@ -714,6 +725,14 @@ public abstract class RevisionDiffPanel extends Panel {
return RevisionDiffPanel.this.getPullRequest();
}
+ @Override
+ protected void onActivate(AjaxRequestTarget target) {
+ selectedPath = change.getPath();
+ var encodedPath = encodePath(selectedPath);
+ target.appendJavaScript(String.format(
+ "onedev.server.revisionDiff.setDiffLinkActive('diff-link-%s');$('#diff-link-%s')[0].scrollIntoViewIfNeeded(false);",
+ encodedPath, encodedPath));
+ }
};
item.add(diffPanel);
if (change.getOldBlobIdent().path != null && !change.getOldBlobIdent().path.equals(change.getPath()))
@@ -721,6 +740,13 @@ public abstract class RevisionDiffPanel extends Panel {
}
});
+ body.add(new WebMarkupContainer("noDiffs") {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getDisplayChanges().isEmpty());
+ }
+ });
add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@@ -1268,8 +1294,6 @@ public abstract class RevisionDiffPanel extends Panel {
}
};
- navigationContainer.setOutputMarkupPlaceholderTag(true);
- navigationContainer.setVisible(isNavigationVisibleInitially());
float navigationWidth = 360;
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
@@ -1282,8 +1306,8 @@ public abstract class RevisionDiffPanel extends Panel {
var changes = new TreeMap<String, BlobChange>();
var treeState = new HashSet<String>();
- for (var change: getDisplayChanges()) {
- for (var path: change.getPaths()) {
+ for (var change : getDisplayChanges()) {
+ for (var path : change.getPaths()) {
changes.put(path, change);
var parent = Paths.get(path).getParent();
while (parent != null) {
@@ -1292,98 +1316,119 @@ public abstract class RevisionDiffPanel extends Panel {
}
}
}
-
- navigationContainer.add(new NestedTree<String>("content", new ITreeProvider<>() {
-
- @Override
- public Iterator<? extends String> getRoots() {
- return RevisionDiffPanel.this.getChildren(changes.keySet(), "").iterator();
- }
+ if (!changes.isEmpty()) {
+ navigationContainer.add(new NestedTree<String>("content", new ITreeProvider<>() {
- @Override
- public boolean hasChildren(String node) {
- return node.endsWith("/");
- }
+ @Override
+ public Iterator<? extends String> getRoots() {
+ return RevisionDiffPanel.this.getChildren(changes.keySet(), "").iterator();
+ }
- @Override
- public Iterator<? extends String> getChildren(String node) {
- return RevisionDiffPanel.this.getChildren(changes.keySet(), node).iterator();
- }
+ @Override
+ public boolean hasChildren(String node) {
+ return node.endsWith("/");
+ }
- @Override
- public IModel<String> model(String object) {
- return Model.of(object);
- }
+ @Override
+ public Iterator<? extends String> getChildren(String node) {
+ return RevisionDiffPanel.this.getChildren(changes.keySet(), node).iterator();
+ }
- @Override
- public void detach() {
- }
-
- }, Model.ofSet(treeState)) {
+ @Override
+ public IModel<String> model(String object) {
+ return Model.of(object);
+ }
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<String> model) {
- var path = model.getObject();
- var fragment = new Fragment(id, "navTreeNodeFrag", RevisionDiffPanel.this);
- WebMarkupContainer link;
- if (path.endsWith("/")) {
- link = new AjaxLink<Void>("link") {
+ @Override
+ public void detach() {
+ }
+ }, Model.ofSet(treeState)) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<String> model) {
+ var path = model.getObject();
+ var fragment = new Fragment(id, "navTreeNodeFrag", RevisionDiffPanel.this);
+ fragment.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
- public void onClick(AjaxRequestTarget target) {
- if (getState(path) == State.EXPANDED)
- collapse(path);
- else
- expand(path);
+ public String getObject() {
+ return path.equals(selectedPath) ? "active" : "";
}
- };
- link.add(new SpriteImage("icon", "folder"));
- } else {
- link = new WebMarkupContainer("link");
- link.add(AttributeModifier.append("href", "#diff-" + encodePath(path)));
- String icon;
- String color;
- var change = changes.get(path);
- if (change.getType() == ChangeType.ADD || change.getType() == ChangeType.COPY) {
- icon = "plus-square";
- color = "text-success";
- } else if (change.getType() == ChangeType.DELETE) {
- icon = "minus-square";
- color = "text-danger";
- } else if (change.getType() == ChangeType.MODIFY) {
- icon = "dot-square";
- color = "text-warning";
+ }));
+ WebMarkupContainer link;
+ if (path.endsWith("/")) {
+ link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (getState(path) == State.EXPANDED)
+ collapse(path);
+ else
+ expand(path);
+ }
+ };
+ link.add(new SpriteImage("icon", "folder"));
} else {
- icon = "arrow-square";
- color = "text-warning";
- }
- link.add(new SpriteImage("icon", icon).add(AttributeAppender.append("class", color)));
- }
-
- link.add(new Label("label", new LoadableDetachableModel<String>() {
- @Override
- protected String load() {
- String label = path;
- var branchItem = fragment.getParent().getParent().findParent(BranchItem.class);
- if (branchItem != null) {
- var parentPath = (String) branchItem.getModelObject();
- label = path.substring(parentPath.length());
+ link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ selectedPath = path;
+ var encodedPath = encodePath(selectedPath);
+ target.appendJavaScript(String.format(
+ "onedev.server.revisionDiff.setDiffLinkActive('diff-link-%s');$('#diff-%s')[0].scrollIntoView();",
+ encodedPath, encodedPath));
+ }
+ };
+ link.setMarkupId("diff-link-" + encodePath(path));
+ String icon;
+ String color;
+ var change = changes.get(path);
+ if (change.getType() == ChangeType.ADD || change.getType() == ChangeType.COPY) {
+ icon = "plus-square";
+ color = "text-success";
+ } else if (change.getType() == ChangeType.DELETE) {
+ icon = "minus-square";
+ color = "text-danger";
+ } else if (change.getType() == ChangeType.MODIFY) {
+ icon = "dot-square";
+ color = "text-warning";
+ } else {
+ icon = "arrow-square";
+ color = "text-warning";
}
- return StringUtils.stripEnd(label, "/");
+ link.add(new SpriteImage("icon", icon).add(AttributeAppender.append("class", color)));
}
- }));
- fragment.add(link);
-
- return fragment;
- }
- });
-
+
+ link.add(new Label("label", new LoadableDetachableModel<String>() {
+ @Override
+ protected String load() {
+ String label = path;
+ var branchItem = fragment.getParent().getParent().findParent(BranchItem.class);
+ if (branchItem != null) {
+ var parentPath = (String) branchItem.getModelObject();
+ label = path.substring(parentPath.length());
+ }
+ return StringUtils.stripEnd(label, "/");
+ }
+ }));
+ fragment.add(link);
+
+ return fragment;
+ }
+ });
+ } else {
+ navigationContainer.add(new Label("content", "<i>No diffs to navigate</i>").setEscapeModelStrings(false));
+ }
+
+ navigationContainer.setOutputMarkupPlaceholderTag(true);
+ navigationContainer.setVisible(isNavigationVisibleInitially());
return navigationContainer;
}
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 5fcf350d2d..2683e492b6 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
@@ -78,8 +78,20 @@
.revision-diff>.body>.detail>.navigation>.ui-resizable-handle {
left: 0;
}
-
+.revision-diff>.body>.detail>.diffs:empty {
+ display: none;
+}
.revision-diff>.body>.detail>.diffs>.diff:last-child {
margin-bottom: 0 !important;
}
-
+.revision-diff>.body>.detail>.navigation>.content .tree-content>a {
+ display: inline-block;
+ border-radius: 4px;
+ padding: 1px 4px 1px 3px;
+}
+.revision-diff>.body>.detail>.navigation>.content .tree-content>a.active {
+ background: #FCF5DA;
+}
+.dark-mode .revision-diff>.body>.detail>.navigation>.content .tree-content>a.active {
+ background: var(--dark-mode-light-warning);
+}
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 62c106b1fb..5b4667bf78 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
@@ -1,9 +1,11 @@
onedev.server.revisionDiff = {
onBodyDomReady: function() {
- var $anchors = $(".revision-diff>.body li.diff, .revision-diff>.body li.diff>div");
- $anchors.css("scroll-margin-top", $(".revision-diff>.head").outerHeight() + "px");
- if ($anchors.length != 0)
- $anchors[0].scrollIntoView();
+ $(".revision-diff>.body li.diff, .revision-diff>.body li.diff>div")
+ .css("scroll-margin-top", $(".revision-diff>.head").outerHeight() + "px");
+ },
+ setDiffLinkActive: function(linkId) {
+ $(".revision-diff>.body>.detail>.navigation .tree-content>a").removeClass("active");
+ $("#" + linkId).addClass('active');
},
initComment: function() {
var $comment = $(".revision-diff>.body>.detail>.comment");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
index d1a356d33b..08cdb32d4b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
@@ -41,14 +41,15 @@
.source-view>.outline>.content {
padding: 0.5rem 1rem;
}
-.source-view>.outline>.content .tree-content {
+.source-view>.outline>.content .tree-content>a {
+ display: inline-block;
border-radius: 4px;
padding: 1px 4px 1px 3px;
}
-.source-view>.outline>.content .tree-content.active {
+.source-view>.outline>.content .tree-content>a.active {
background: #FCF5DA;
}
-.dark-mode .source-view>.outline>.content .tree-content.active {
+.dark-mode .source-view>.outline>.content .tree-content>a.active {
background: var(--dark-mode-light-warning);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
index 08089d5f1e..d850f21594 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
@@ -213,13 +213,13 @@ onedev.server.sourceView = {
},
syncOutline: function(symbolId) {
var $body = $(".source-view>.outline>.content>.body");
- var $symbol = $("#" + symbolId);
- if ($symbol.length != 0) {
- $symbol[0].scrollIntoViewIfNeeded(true);
- $body.find(".tree-content").removeClass("active");
- $symbol.addClass("active");
+ var $symbolLink = $("#" + symbolId + ">a");
+ if ($symbolLink.length != 0) {
+ $symbolLink[0].scrollIntoViewIfNeeded(false);
+ $body.find(".tree-content>a").removeClass("active");
+ $symbolLink.addClass("active");
} else {
- $body.find(".tree-content").removeClass("active");
+ $body.find(".tree-content>a").removeClass("active");
}
},
addCoverageGutter: function(line, coverageStatus) {