Skip to content

The Unified and Autonomous Development Platform

Fix issue #776 - Make pull request file change options fixed at top of page

Robin Shen2df609be5cfa
diff --git a/pom.xml b/pom.xml
index 5f4cb5017f..e3acf7bf5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,8 +588,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.2.0</commons.version>
- <agent.version>1.3.11</agent.version>
+ <commons.version>2.2.1</commons.version>
+ <agent.version>1.3.12</agent.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.9</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
index f4f352c803..2254f48903 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/addon/runmode/runmode-standalone.js
@@ -55,7 +55,7 @@ StringStream.prototype = {
}
} else {
var match = this.string.slice(this.pos).match(pattern);
- if (match && match.index > 0) return null;
+ if (match && (match.index > 0 || /* fix infinite loop issue */ match[0].length == 0)) return null;
if (match && consume !== false) this.pos += match[0].length;
return match;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js
index eeee3ac9ec..a2799270fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/lib/codemirror.js
@@ -1475,7 +1475,7 @@ StringStream.prototype = {
}
} else {
var match = this.string.slice(this.pos).match(pattern)
- if (match && match.index > 0) { return null }
+ if (match && (match.index > 0 || /* fix infinite loop issue */ match[0].length == 0)) return null;
if (match && consume !== false) { this.pos += match[0].length }
return match
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/markdown/markdown.js
index 6aedc360b0..2f0b3f8e80 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/markdown/markdown.js
@@ -784,7 +784,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
state.trailingSpaceNewLine = false;
state.f = state.block;
- var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length;
+ var match = stream.match(/^\s*/, true);
+ var indentation = match ? match[0].replace(/\t/g, ' ').length : 0;
state.indentationDiff = Math.min(indentation - state.indentation, 4);
state.indentation = state.indentation + state.indentationDiff;
if (indentation > 0) return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java
deleted file mode 100644
index 4107973efe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.asset.scrollintoview;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-
-import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-
-public class ScrollIntoViewResourceReference extends JavaScriptResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ScrollIntoViewResourceReference() {
- super(ScrollIntoViewResourceReference.class, "jquery.scrollintoview.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = new ArrayList<>();
- dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
deleted file mode 100644
index c349430338..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 2015, Robin Shen
- */
-(function ( $ ) {
-
- $.fn.scrollIntoView = function(scrollParent, animation) {
- var $this = jQuery(this);
-
- if ($this.length != 0) {
- var $scrollParent = scrollParent? $(scrollParent): $(this).scrollParent(true);
-
- var scrollParentTop, scrollParentBottom, thisTop, thisBottom;
- if ($scrollParent[0] == document) {
- scrollParentTop = 0;
- scrollParentBottom = $(window).height();
- thisTop = $this.offset().top - $(window).scrollTop();
- } else {
- scrollParentTop = $scrollParent.offset().top;
- scrollParentBottom = scrollParentTop + $scrollParent.height();
- thisTop = $this.offset().top;
- }
- var thisHeight = $this.outerHeight();
- thisBottom = thisTop + thisHeight;
-
- if (thisHeight > scrollParentBottom - scrollParentTop) {
- var scrollOffset = Math.floor(thisTop - scrollParentTop);
- if (animation)
- $scrollParent.animate({scrollTop: $scrollParent.scrollTop() + scrollOffset});
- else
- $scrollParent.scrollTop($scrollParent.scrollTop() + scrollOffset);
- } else {
- var beyondTop = scrollParentTop - thisTop;
- if (beyondTop > 0) {
- beyondTop = Math.ceil(beyondTop);
- if (animation)
- $scrollParent.animate({scrollTop: $scrollParent.scrollTop() - beyondTop});
- else
- $scrollParent.scrollTop($scrollParent.scrollTop() - beyondTop);
- } else {
- var beyondBottom = thisBottom - scrollParentBottom;
- if (beyondBottom > 0) {
- beyondBottom = Math.ceil(beyondBottom);
- if (animation)
- $scrollParent.animate({scrollTop: $scrollParent.scrollTop() + beyondBottom});
- else
- $scrollParent.scrollTop($scrollParent.scrollTop() + beyondBottom);
- }
- }
- }
-
- var scrollParentLeft, scrollParentRight, thisLeft, thisRight;
- if ($scrollParent[0] == document) {
- scrollParentLeft = 0;
- scrollParentRight = $(window).width();
- thisLeft = $this.offset().left - $(window).scrollLeft();
- } else {
- scrollParentLeft = $scrollParent.offset().left;
- scrollParentRight = scrollParentLeft + $scrollParent.width();
- thisLeft = $this.offset().left;
- }
- var thisWidth = $this.outerWidth();
- thisRight = thisLeft + thisWidth;
-
- if (thisWidth > scrollParentRight - scrollParentLeft) {
- var scrollOffset = Math.floor(thisLeft - scrollParentLeft);
- if (animation)
- $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() + scrollOffset});
- else
- $scrollParent.scrollLeft($scrollParent.scrollLeft() + scrollOffset);
- } else {
- var beyondLeft = scrollParentLeft - thisLeft;
- if (beyondLeft > 0) {
- beyondLeft = Math.ceil(beyondLeft);
- if (animation)
- $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() - beyondLeft});
- else
- $scrollParent.scrollLeft($scrollParent.scrollLeft() - beyondLeft);
- } else {
- var beyondRight = thisRight - scrollParentRight;
- if (beyondRight > 0) {
- beyondRight = Math.ceil(beyondRight);
- if (animation)
- $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() + beyondRight});
- else
- $scrollParent.scrollLeft($scrollParent.scrollLeft() + beyondRight);
- }
- }
- }
- }
-
- return this;
- };
-
-}( jQuery ));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/SelectByTypingResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/SelectByTypingResourceReference.java
index dc80aa4ea0..725f739014 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/SelectByTypingResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/SelectByTypingResourceReference.java
@@ -9,7 +9,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;
import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.page.base.BaseCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -25,7 +24,6 @@ public class SelectByTypingResourceReference extends BaseDependentResourceRefere
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = new ArrayList<>();
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseCssResourceReference()));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
index bca58a3ec4..f5014cc7df 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
@@ -44,7 +44,7 @@
var $prev = $selectables.eq(index);
$active.removeClass("active");
$prev.addClass("active");
- $prev.scrollIntoView();
+ $prev[0].scrollIntoViewIfNeeded(false);
}
};
@@ -59,7 +59,7 @@
var $next = $selectables.eq(index);
$active.removeClass("active");
$next.addClass("active");
- $next.scrollIntoView();
+ $next[0].scrollIntoViewIfNeeded(false);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
index 80e1f78e49..1d92d617db 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
@@ -1,11 +1,5 @@
package io.onedev.server.web.behavior.infinitescroll;
-import java.util.List;
-
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class InfiniteScrollResourceReference extends BaseDependentResourceReference {
@@ -16,11 +10,4 @@ public class InfiniteScrollResourceReference extends BaseDependentResourceRefere
super(InfiniteScrollResourceReference.class, "infinite-scroll.js");
}
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> items = super.getDependencies();
- items.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
- return items;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
index eaa1af3722..236b93239b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
@@ -59,7 +59,7 @@ onedev.server.infiniteScroll = {
} else {
$lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/img/" + ajaxIndicator + "'></img></div>");
}
- $container.find(".loading-indicator").scrollIntoView();
+ $container.find(".loading-indicator")[0].scrollIntoViewIfNeeded(false);
} else if (scrollTop) {
if (scrollTop > $container.scrollTop())
$container.scrollTop(scrollTop);
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java
index 546fd68f8d..59dbdfa6eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java
@@ -8,7 +8,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.caret.CaretResourceReference;
import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -24,7 +23,6 @@ public class InputAssistResourceReference extends BaseDependentResourceReference
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
index 28008eca43..1b36acdb7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
@@ -63,7 +63,7 @@ onedev.server.inputassist = {
} else {
$dropdown.find("li:not(.loading-indicator)").last().addClass("active");
}
- $dropdown.find(".suggestions li.active").scrollIntoView();
+ $dropdown.find(".suggestions li.active")[0].scrollIntoViewIfNeeded(false);
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
@@ -83,7 +83,7 @@ onedev.server.inputassist = {
} else {
$dropdown.find("li:not(.loading-indicator)").first().addClass("active");
}
- $dropdown.find(".suggestions li.active").scrollIntoView();
+ $dropdown.find(".suggestions li.active")[0].scrollIntoViewIfNeeded(false);
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.js b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.js
index a9cce3bfa8..b83287a67f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/branch-selector.js
@@ -22,7 +22,7 @@ onedev.server.branchSelector = {
$prev.addClass("active");
callback("up");
}
- $container.find("ul.branches li.active").scrollIntoView();
+ $container.find("ul.branches li.active")[0].scrollIntoViewIfNeeded(false);
});
$input.bind("keydown", "down", function(e) {
e.preventDefault();
@@ -33,7 +33,7 @@ onedev.server.branchSelector = {
$next.addClass("active");
callback("down");
}
- $container.find("ul.branches li.active").scrollIntoView();
+ $container.find("ul.branches li.active")[0].scrollIntoViewIfNeeded(false);
});
}
};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 8c60f72a3d..0d72208cad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -21,7 +21,6 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
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.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -54,7 +53,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.UrlUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.MarkdownViewer;
@@ -431,7 +429,6 @@ public abstract class CodeCommentPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));
}
@@ -550,7 +547,7 @@ public abstract class CodeCommentPanel extends Panel {
String script = String.format(""
+ "setTimeout(function() {"
- + " $('#%s').scrollIntoView();"
+ + " document.getElementById('%s').scrollIntoViewIfNeeded(false);"
+ "}, 0);",
saveButton.getMarkupId());
target.appendJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
index ee18ef5089..8603d6c3d7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html
@@ -1,16 +1,14 @@
<wicket:panel>
+ <div class="d-flex align-items-center px-3 py-2 border position-sticky text-diff-caption">
+ <div wicket:id="diffStat" class="mr-2 text-nowrap"></div>
+ <div wicket:id="title" class="mr-3 text-break"></div>
+ <div wicket:id="actions" class="ml-auto text-nowrap">
+ <a wicket:id="blameFile" title="Blame" class="btn btn-xs btn-icon btn-light btn-hover-secondary btn-active-primary"><wicket:svg href="commit" class="icon"/></a>
+ <a wicket:id="viewFile" title="View" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="eye" class="icon"/></a>
+ <a wicket:id="editFile" title="Edit" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="edit" class="icon"/></a>
+ </div>
+ </div>
<table class="text-diff cm-s-eclipse">
- <caption class="p-0">
- <div class="d-flex align-items-center px-3 py-2 border">
- <div wicket:id="diffStat" class="mr-2 text-nowrap"></div>
- <div wicket:id="title" class="mr-3 text-break"></div>
- <div wicket:id="actions" class="ml-auto text-nowrap">
- <a wicket:id="blameFile" title="Blame" class="btn btn-xs btn-icon btn-light btn-hover-secondary btn-active-primary"><wicket:svg href="commit" class="icon"/></a>
- <a wicket:id="viewFile" title="View" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="eye" class="icon"/></a>
- <a wicket:id="editFile" title="Edit" class="btn btn-xs btn-icon btn-light btn-hover-secondary ml-1"><wicket:svg href="edit" class="icon"/></a>
- </div>
- </div>
- </caption>
<wicket:container wicket:id="diffLines"></wicket:container>
</table>
<div wicket:id="symbolTooltip"></div>
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 ed7bd4b100..35f41197e9 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
@@ -13,7 +13,6 @@ import io.onedev.server.web.asset.codeproblem.CodeProblemResourceReference;
import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceReference;
import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -33,7 +32,6 @@ 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 ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeProblemResourceReference()));
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.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
index e49000a9f2..9343dce562 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css
@@ -3,13 +3,14 @@
width: 100%;
border-collapse: separate;
}
-.text-diff>caption {
- caption-side: top;
-}
-.text-diff>caption>div {
+.text-diff-caption {
border-radius: 0.42rem 0.42rem 0 0;
+ top: 64px;
+ background: white;
+ z-index: 5;
}
-.dark-mode .text-diff>caption>div {
+.dark-mode .text-diff-caption {
+ background: var(--dark-mode-dark);
border-color: var(--dark-mode-lighter-dark) !important;
}
.text-diff>tbody {
@@ -280,3 +281,4 @@
.dark-mode ::selection {
background-color: #1e496c;
}
+
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 fd1542d216..78583363be 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
@@ -907,15 +907,16 @@ onedev.server.textDiff = {
var $endTd = markInfo.endTd;
if ($startTd && $endTd) {
var $scrollParent = $startTd.scrollParent();
- $scrollParent.scrollTop($startTd.offset().top - $scrollParent.offset().top + $scrollParent.scrollTop()-50);
+ var marginTop = $startTd.closest(".text-diff").prev().height() + 120;
+ $scrollParent.scrollTop($startTd.offset().top - $scrollParent.offset().top + $scrollParent.scrollTop()-marginTop);
}
},
scrollIntoView: function($container, markRange) {
var markInfo = onedev.server.textDiff.getMarkInfo($container, markRange);
var $startTd = markInfo.startTd;
var $endTd = markInfo.endTd;
- if ($startTd && $endTd)
- $startTd.scrollIntoView();
+ if ($startTd && $endTd)
+ $startTd[0].scrollIntoViewIfNeeded();
},
mark: function($container, markRangeOrMarkRanges) {
onedev.server.textDiff.clearMark($container);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java
new file mode 100644
index 0000000000..d505dd34b3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java
@@ -0,0 +1,39 @@
+package io.onedev.server.web.component.diff.revision;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class DiffOption implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private DiffViewMode viewMode = DiffViewMode.UNIFIED;
+
+ private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;
+
+ @Editable(order=100)
+ @NotNull
+ public DiffViewMode getViewMode() {
+ return viewMode;
+ }
+
+ public void setViewMode(DiffViewMode viewMode) {
+ this.viewMode = viewMode;
+ }
+
+ @Editable(order=200)
+ @NotNull
+ public WhitespaceOption getWhitespaceOption() {
+ return whitespaceOption;
+ }
+
+ public void setWhitespaceOption(WhitespaceOption whitespaceOption) {
+ this.whitespaceOption = whitespaceOption;
+ }
+
+}
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 dd5bb05bc3..c0766a029a 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
@@ -5,17 +5,9 @@
Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)
</div>
<!-- disable auto focus here as otherwise we have problems jumping to marked code blocks -->
- <div class="head no-autofocus d-flex align-items-center flex-wrap">
- <div class="view-mode mr-3 mb-4 flex-shrink-0">
- <span class="btn-group">
- <a wicket:id="unified" class="btn btn-outline-secondary">Unified</a>
- <a wicket:id="split" class="btn btn-outline-secondary">Split</a>
- </span>
- </div>
- <div class="whitespace-option mr-3 mb-4 flex-shrink-0">
- <span wicket:id="whitespaceOption" class="btn btn-outline-secondary dropdown-toggle" title="White space options">White space</span>
- </div>
- <div class="path-filter mb-4 flex-grow-1">
+ <div class="head no-autofocus d-flex align-items-center flex-nowrap">
+ <a wicket:id="option" class="btn btn-light btn-icon btn-lg flex-shrink-0 mr-3"><wicket:svg href="gear" class="icon"/></a>
+ <div class="path-filter flex-grow-1 mr-5">
<form wicket:id="pathFilter">
<div class="clearable-wrapper">
<div class="input-group">
@@ -27,23 +19,25 @@
</div>
</form>
</div>
+ <div wicket:id="navs" class="ml-auto flex-shrink-0 border rounded navs">
+ <div wicket:id="showAllFiles" class="font-size-lg d-flex align-items-center flex-nowrap flex-shrink-0">
+ <span wicket:id="totalFiles"></span>
+ <wicket:enclosure child="showSingleFile">
+ <span class="dot mx-3"></span>
+ <a wicket:id="showSingleFile">Show one by one</a>
+ </wicket:enclosure>
+ </div>
+ <div wicket:id="showSingleFile" class="font-size-lg d-flex align-items-center flex-nowrap flex-shrink-0">
+ <span wicket:id="message"></span>
+ <a wicket:id="prev" class="ml-3">Prev</a>
+ <a wicket:id="next" class="ml-2">Next</a>
+ <span class="dot mx-3"></span>
+ <a wicket:id="showAllFiles">Show all files</a>
+ </div>
+ </div>
</div>
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
- <div wicket:id="showAllFiles" class="font-size-lg d-flex align-items-center mb-4">
- <span wicket:id="totalFiles"></span>
- <wicket:enclosure child="showSingleFile">
- <span class="dot mx-3"></span>
- <a wicket:id="showSingleFile">Show one by one</a>
- </wicket:enclosure>
- </div>
- <div wicket:id="showSingleFile" class="font-size-lg d-flex align-items-center mb-4">
- <span wicket:id="message"></span>
- <a wicket:id="prev" class="ml-3">Prev</a>
- <a wicket:id="next" class="ml-2">Next</a>
- <span class="dot mx-3"></span>
- <a wicket:id="showAllFiles">Show all files</a>
- </div>
<div wicket:id="tooManyFiles" class="alert alert-notice alert-light-warning"></div>
<div class="detail d-flex align-items-stretch">
<div wicket:id="comment" class="comment need-width border border-right-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky mr-4">
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 9944476879..91747cc2fe 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
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.diff.revision;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -33,7 +34,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -86,13 +86,13 @@ import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.menu.MenuItem;
-import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.base.BasePage;
@@ -299,6 +299,8 @@ public abstract class RevisionDiffPanel extends Panel {
private ListView<BlobChange> diffsView;
+ private WebMarkupContainer navs;
+
private WebMarkupContainer body;
public RevisionDiffPanel(String id, String oldRev, String newRev, IModel<String> pathFilterModel,
@@ -349,6 +351,7 @@ public abstract class RevisionDiffPanel extends Panel {
private void doFilter(AjaxRequestTarget target) {
body.replace(commentContainer = newCommentContainer());
target.add(body);
+ target.add(navs);
}
@Nullable
@@ -411,93 +414,35 @@ public abstract class RevisionDiffPanel extends Panel {
});
- for (DiffViewMode each: DiffViewMode.values()) {
- add(new AjaxLink<Void>(each.name().toLowerCase()) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(body));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- diffMode = each;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_VIEW_MODE, diffMode.name());
- cookie.setMaxAge(Integer.MAX_VALUE);
- cookie.setPath("/");
- response.addCookie(cookie);
- target.add(body);
-
- for (DiffViewMode each: DiffViewMode.values())
- target.add(getParent().get(each.name().toLowerCase()));
-
- ((BasePage)getPage()).resizeWindow(target);
- }
-
- }.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (diffMode == each) {
- if (diffMode == DiffViewMode.SPLIT)
- return "active need-width";
- else
- return "active";
- } else {
- return "";
- }
- }
-
- })));
- }
-
- add(new MenuLink("whitespaceOption") {
+ add(new AjaxLink<Void>("option") {
@Override
- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
- List<MenuItem> menuItems = new ArrayList<>();
-
- for (WhitespaceOption each: WhitespaceOption.values()) {
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return each.getDescription();
- }
-
- @Override
- public boolean isSelected() {
- return whitespaceOptionModel.getObject() == each;
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
- whitespaceOptionModel.setObject(each);
- target.add(body);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(body));
- }
-
- };
- }
+ public void onClick(AjaxRequestTarget target) {
+ DiffOption diffOption = new DiffOption();
+ diffOption.setViewMode(diffMode);
+ new BeanEditModalPanel(target, diffOption) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean, Collection<String> propertyNames) {
+ DiffOption diffOption = (DiffOption) bean;
+ diffMode = diffOption.getViewMode();
- });
- }
-
- return menuItems;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_VIEW_MODE, diffMode.name());
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ cookie.setPath("/");
+ response.addCookie(cookie);
+
+ whitespaceOptionModel.setObject(diffOption.getWhitespaceOption());
+
+ target.add(navs);
+ target.add(body);
+
+ close();
+ }
+ };
}
-
+
});
Form<?> pathFilterForm = new Form<Void>("pathFilter");
@@ -550,6 +495,13 @@ public abstract class RevisionDiffPanel extends Panel {
doFilter(target);
}
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(body));
+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));
+ }
+
});
pathFilterForm.add(new AjaxButton("submit") {
@@ -558,6 +510,7 @@ public abstract class RevisionDiffPanel extends Panel {
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(body));
+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));
}
@Override
@@ -569,23 +522,12 @@ public abstract class RevisionDiffPanel extends Panel {
});
add(pathFilterForm);
-
- body = new WebMarkupContainer(BODY_ID) {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.onDomReady();"));
- }
-
- };
- body.setOutputMarkupId(true);
- add(body);
-
- body.add(new FencedFeedbackPanel("feedback", this));
- body.add(commentContainer = newCommentContainer());
-
- body.add(new WebMarkupContainer("showAllFiles") {
+
+ navs = new WebMarkupContainer("navs");
+ navs.setOutputMarkupId(true);
+ add(navs);
+
+ navs.add(new WebMarkupContainer("showAllFiles") {
@Override
protected void onInitialize() {
@@ -598,12 +540,13 @@ public abstract class RevisionDiffPanel extends Panel {
}
}));
- add(new AjaxLink<Void>("showSingleFile") {
+ add(new ViewStateAwareAjaxLink<Void>("showSingleFile") {
@Override
public void onClick(AjaxRequestTarget target) {
setCurrentFile(getTotalChanges().iterator().next().getPath());
target.add(body);
+ target.add(navs);
}
@Override
@@ -623,7 +566,7 @@ public abstract class RevisionDiffPanel extends Panel {
});
- body.add(new WebMarkupContainer("showSingleFile") {
+ navs.add(new WebMarkupContainer("showSingleFile") {
private int getIndex() {
int index = 0;
@@ -639,7 +582,7 @@ public abstract class RevisionDiffPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("prev") {
+ add(new ViewStateAwareAjaxLink<Void>("prev") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -647,6 +590,8 @@ public abstract class RevisionDiffPanel extends Panel {
if (index >=0 && index < getTotalChanges().size()) {
setCurrentFile(getTotalChanges().get(index).getPath());
target.add(body);
+ target.add(navs);
+ target.appendJavaScript("onedev.server.revisionDiff.scrollToFilesTop();");
}
}
@@ -681,7 +626,7 @@ public abstract class RevisionDiffPanel extends Panel {
}));
- add(new AjaxLink<Void>("next") {
+ add(new ViewStateAwareAjaxLink<Void>("next") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -689,6 +634,8 @@ public abstract class RevisionDiffPanel extends Panel {
if (index >=0 && index < getTotalChanges().size()) {
setCurrentFile(getTotalChanges().get(index).getPath());
target.add(body);
+ target.add(navs);
+ target.appendJavaScript("onedev.server.revisionDiff.scrollToFilesTop();");
}
}
@@ -710,12 +657,13 @@ public abstract class RevisionDiffPanel extends Panel {
});
- add(new AjaxLink<Void>("showAllFiles") {
+ add(new ViewStateAwareAjaxLink<Void>("showAllFiles") {
@Override
public void onClick(AjaxRequestTarget target) {
setCurrentFile(null);
target.add(body);
+ target.add(navs);
}
});
@@ -728,7 +676,14 @@ public abstract class RevisionDiffPanel extends Panel {
}
});
-
+
+ body = new WebMarkupContainer(BODY_ID);
+ body.setOutputMarkupId(true);
+ add(body);
+
+ body.add(new FencedFeedbackPanel("feedback", this));
+ body.add(commentContainer = newCommentContainer());
+
body.add(new Label("tooManyFiles", new AbstractReadOnlyModel<String>() {
@Override
@@ -1388,7 +1343,6 @@ public abstract class RevisionDiffPanel extends Panel {
annotationSupport.onUnmark(target);
}
}
- target.prependJavaScript("$('body').removeClass('hide-side-info');");
}
});
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 0c8a2dc210..95733ba3f9 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
@@ -1,3 +1,18 @@
+.revision-diff>.head {
+ position: sticky;
+ top: 0;
+ background: white;
+ z-index: 10;
+ padding-bottom: 1.6rem;
+ height: 64px;
+}
+.dark-mode .revision-diff>.head {
+ background: var(--dark-mode-dark);
+}
+.revision-diff>.head>.navs {
+ padding: 8px 12px;
+ border-style: dashed !important;
+}
.revision-diff>.body>.title {
font-size: 1.2rem;
margin-bottom: 1.2rem;
@@ -36,8 +51,8 @@
}
.revision-diff>.body>.detail>.comment {
- top: 2rem;
- max-height: calc(100vh - 2rem - var(--topbar-height));
+ top: 64px;
+ max-height: calc(100vh - 64px - var(--topbar-height));
}
.revision-diff>.body>.detail>.comment>.ui-resizable-handle {
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 cb41ec9e07..bc89450929 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,25 +1,17 @@
onedev.server.revisionDiff = {
- onDomReady: function() {
- var cookieName = "revisionDiff.showDiffStats";
- var $body = $(".revision-diff>.body");
- var $diffStats = $body.children(".diff-stats");
- var $diffStatsToggle = $body.find(">.title a");
- $diffStatsToggle.click(function() {
- if ($diffStats.is(":visible")) {
- $diffStats.hide();
- $diffStatsToggle.removeClass("expanded");
- Cookies.set(cookieName, "no", {expires: Infinity});
- } else {
- $diffStats.show();
- $diffStatsToggle.addClass("expanded");
- Cookies.set(cookieName, "yes", {expires: Infinity});
- }
- });
+ scrollToFilesTop: function() {
+ var $textDiffContent = $(".text-diff>tbody").first();
+ if ($textDiffContent.length != 0) {
+ var $head = $(".revision-diff>.head");
+ var $textDiffCaption = $textDiffContent.parent().prev();
+ $textDiffContent.css("scroll-margin-top", $head.outerHeight() + $textDiffCaption.outerHeight());
+ $textDiffContent[0].scrollIntoView();
+ console.log("shit");
+ }
},
initComment: function() {
var $comment = $(".revision-diff>.body>.detail>.comment");
if ($comment.is(":visible")) {
- $("body").addClass("hide-side-info");
var $commentResizeHandle = $comment.children(".ui-resizable-handle");
$comment.resizable({
autoHide: false,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
index 7b42426440..23f41d0da7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
@@ -6,7 +6,6 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -23,7 +22,6 @@ public class PipelineResourceReference extends BaseDependentResourceReference {
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(getClass(), "pipeline.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
index 023675813e..986df6ded0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js
@@ -205,7 +205,7 @@ onedev.server.pipeline = {
});
paper.append(e);
});
- $pipeline.find(".active").scrollIntoView();
+ $pipeline.find(".active")[0].scrollIntoViewIfNeeded(false);
},
onSortStart: function($uiItem) {
var $pipeline = $uiItem.closest(".pipeline");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java
index 9dc58b8e67..85ceaac17f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java
@@ -8,7 +8,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class ProjectSelectorResourceReference extends BaseDependentResourceReference {
@@ -23,7 +22,6 @@ public class ProjectSelectorResourceReference extends BaseDependentResourceRefer
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
ProjectSelectorResourceReference.class, "project-selector.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js
index 6c9b384be9..a5bc0847c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js
@@ -22,7 +22,7 @@ onedev.server.projectSelector = {
$active.removeClass("active");
$prev.addClass("active");
}
- $("li.project.active").scrollIntoView();
+ $("li.project.active")[0].scrollIntoViewIfNeeded(false);
});
$input.bind("keydown", "down", function(e) {
@@ -33,7 +33,7 @@ onedev.server.projectSelector = {
$active.removeClass("active");
$next.addClass("active");
}
- $("li.project.active").scrollIntoView();
+ $("li.project.active")[0].scrollIntoViewIfNeeded(false);
});
}
};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
index 1524468085..ff7bfcf423 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
@@ -27,7 +27,7 @@ onedev.server.revisionSelector = {
$active.removeClass("active");
$prev.addClass("active");
}
- $container.find("ul.items li.active").scrollIntoView();
+ $container.find("ul.items li.active")[0].scrollIntoViewIfNeeded(false);
});
$input.bind("keydown", "down", function(e) {
e.preventDefault();
@@ -37,7 +37,7 @@ onedev.server.revisionSelector = {
$active.removeClass("active");
$next.addClass("active");
}
- $container.find("ul.items li.active").scrollIntoView();
+ $container.find("ul.items li.active")[0].scrollIntoViewIfNeeded(false);
});
}
};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 0935559274..8c5a7faa09 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -50,7 +50,9 @@ import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.unbescape.javascript.JavaScriptEscape;
+import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
+import com.google.common.collect.Sets;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AppLoader;
@@ -204,6 +206,8 @@ public abstract class BasePage extends WebPage {
clazz = clazz.getSuperclass();
}
+ builder.append(" ").append(Joiner.on(' ').join(getCssClasses()));
+
if (darkMode)
builder.append(" dark-mode");
@@ -362,6 +366,10 @@ public abstract class BasePage extends WebPage {
return 0;
}
+ protected Collection<String> getCssClasses() {
+ return Sets.newHashSet();
+ }
+
public void resizeWindow(IPartialPageRequestHandler handler) {
handler.appendJavaScript("$(window).resize();");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
index 3dd701470a..a5a31c9a6d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
@@ -15,7 +15,6 @@ import io.onedev.server.web.asset.bootstrap.BootstrapResourceReference;
import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;
import io.onedev.server.web.asset.cookies.CookiesResourceReference;
import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
public class BaseResourceReference extends JavaScriptResourceReference {
@@ -34,7 +33,6 @@ public class BaseResourceReference extends JavaScriptResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new BootstrapResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AlignResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new AutoSizeResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
diff --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.js
index f758b8fe0c..c1f3f419cd 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
@@ -10,6 +10,23 @@ String.prototype.escapeHtml = function() {
.replace(/"/g, "&quot;")
.replace(/'/g, "&#039;");
};
+
+if (!Element.prototype.scrollIntoViewIfNeeded) {
+ Element.prototype.scrollIntoViewIfNeeded = function ( centerIfNeeded = false) {
+ const el = this;
+ new IntersectionObserver( function( [entry] ) {
+ const ratio = entry.intersectionRatio;
+ if (ratio < 1) {
+ let place = ratio <= 0 && centerIfNeeded ? 'center' : 'nearest';
+ el.scrollIntoView( {
+ block: place,
+ inline: place
+ } );
+ }
+ this.disconnect();
+ } ).observe(this);
+ };
+}
onedev.server = {
day: {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js
index b4bb80efb0..7b5fb6d413 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js
@@ -47,7 +47,7 @@ onedev.server.layout = {
$this.toggleClass("open");
$this.next().slideToggle(300, function() {
$sidebarBody.trigger("resized");
- $this.parent().scrollIntoView($sidebarBody[0], true);
+ $this.parent()[0].scrollIntoViewIfNeeded();
});
}
});
@@ -150,15 +150,11 @@ onedev.server.layout = {
onLoad: function() {
var $sidebarBody = $(".sidebar-body");
var scrollTop = window.sessionStorage.getItem("onedev.sidebar.scrollTop");
- var currentMenuLinkCount = $(".sidebar-menu .menu-link").length;
if (scrollTop) {
window.sessionStorage.removeItem("onedev.sidebar.scrollTop");
$sidebarBody.scrollTop(scrollTop);
} else {
- var menuChanged = (currentMenuLinkCount != window.sessionStorage.getItem("onedev.sidebar.menuLinkCount"));
- $(".sidebar-menu .menu-link.active:visible").last()
- .scrollIntoView(document.querySelector(".sidebar-body"), menuChanged);
+ $(".sidebar-menu .menu-link.active:visible").last()[0].scrollIntoViewIfNeeded();
}
- window.sessionStorage.setItem("onedev.sidebar.menuLinkCount", currentMenuLinkCount);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
index 0eec940002..41d94ecff4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
@@ -14,7 +14,6 @@ import io.onedev.server.web.asset.commentindicator.CommentIndicatorCssResourceRe
import io.onedev.server.web.asset.cookies.CookiesResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
@@ -34,7 +33,6 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
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 e252e9cfba..e971b933fa 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
@@ -202,7 +202,7 @@ onedev.server.sourceView = {
syncOutline: function(symbolId) {
var $symbol = $("#" + symbolId);
var $body = $(".source-view>.outline>.content>.body");
- $symbol.scrollIntoView();
+ $symbol[0].scrollIntoViewIfNeeded(true);
$body.find(".tree-content").removeClass("active");
$symbol.addClass("active");
},
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 204537f85c..d85d1d8518 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -139,7 +139,7 @@ public abstract class SearchResultPanel extends Panel {
String script = String.format(""
+ "$('#%s').find('.selectable').removeClass('active');"
+ "$('#%s').addClass('active');"
- + "$('#%s>.search-result>.body a.selectable.active').scrollIntoView();",
+ + "$('#%s>.search-result>.body a.selectable.active')[0].scrollIntoViewIfNeeded();",
getMarkupId(), activeLinkId, getMarkupId());
target.appendJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java
index 6d11be4cef..7d2056da66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java
@@ -7,7 +7,6 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.uri.URIResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -23,7 +22,6 @@ public class SearchResultResourceReference extends BaseDependentResourceReferenc
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new URIResourceReference()));
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new CssResourceReference(SearchResultResourceReference.class, "search-result.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index d8c620bf4d..87672b2ffd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -749,6 +749,11 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
return null;
}
+ @Override
+ protected Collection<String> getCssClasses() {
+ return Sets.newHashSet("hide-side-info");
+ }
+
@Override
public String getMarkUrl(Mark mark) {
State markState = new State();