The Unified and Autonomous Development Platform
Refactoring jquery.scrollintoview.js
Robin Shenf1be4c2fa114
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.javaindex 359bada34b..e38ba6ae60 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java@@ -8,6 +8,7 @@ import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.criterion.Restrictions;import org.hibernate.criterion.SimpleExpression;import org.slf4j.Logger;@@ -24,7 +25,6 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.OneAuthorizingRealm;@Singletonpublic class DefaultSshKeyManager extends AbstractEntityManager<SshKey> implements SshKeyManager {diff --git a/server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.js b/server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.jsdeleted file mode 100644index f4dfd62111..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.js+++ /dev/null@@ -1,33 +0,0 @@-/*- * 2015, Robin Shen- */-(function ( $ ) {-- var defaultTopMargin = defaultBottomMargin = 8;-- $.fn.jumpIntoView = function(selector, topMargin, bottomMargin) {- if (topMargin == undefined)- topMargin = defaultTopMargin;- if (bottomMargin == undefined)- bottomMargin = defaultBottomMargin;-- var $container = jQuery(this);- var $active = $container.find(selector);-- if ($active.length != 0) {- var containerTop = $container.offset().top;- var containerBottom = containerTop + $container.height();- var activeBottom = $active.offset().top + $active.height();-- if (activeBottom+bottomMargin>containerBottom)- $container.scrollTop($container.scrollTop()+(activeBottom+bottomMargin-containerBottom));-- var activeTop = $active.offset().top;- if (activeTop-topMargin<containerTop)- $container.scrollTop($container.scrollTop()-(containerTop-activeTop+topMargin));- }-- return this;- };--}( jQuery ));diff --git a/server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.javaindex 57a6b72f07..4701531615 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.asset.jumpintoview;+package io.onedev.server.web.asset.scrollintoview;import java.util.ArrayList;import java.util.List;@@ -8,18 +8,21 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.JavaScriptResourceReference;-public class JumpIntoViewResourceReference extends JavaScriptResourceReference {+import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;++public class ScrollIntoViewResourceReference extends JavaScriptResourceReference {private static final long serialVersionUID = 1L;- public JumpIntoViewResourceReference() {- super(JumpIntoViewResourceReference.class, "jquery.jumpintoview.js");+ public ScrollIntoViewResourceReference() {+ super(ScrollIntoViewResourceReference.class, "jquery.scrollintoview.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = new ArrayList<>();dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ 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.jsnew file mode 100644index 0000000000..ec66c54297--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js@@ -0,0 +1,39 @@+/*+ * 2015, Robin Shen+ */+(function ( $ ) {++ var defaultMargin = 8;++ $.fn.scrollIntoView = function(margin) {+ if (margin == undefined)+ margin = defaultMargin;++ var $this = jQuery(this);+ var $scrollParent = $this.scrollParent();++ if ($this.length != 0) {+ var scrollParentTop, scrollParentBottom, thisTop, thisBottom;+ if ($scrollParent[0] == document) {+ scrollParentTop = 0;+ scrollParentBottom = $(window).height();+ thisTop = $this.offset().top - $(window).scrollTop();+ thisBottom = thisTop + $this.height();+ } else {+ scrollParentTop = $scrollParent.offset().top;+ scrollParentBottom = scrollParentTop + $scrollParent.height();+ thisTop = $this.offset().top;+ thisBottom = $this.offset().top + $this.height();+ }++ if (thisBottom + margin > scrollParentBottom)+ $scrollParent.scrollTop($scrollParent.scrollTop() + (thisBottom + margin - scrollParentBottom));++ if (thisTop - margin < scrollParentTop)+ $scrollParent.scrollTop($scrollParent.scrollTop() - (scrollParentTop - thisTop + margin));+ }++ return this;+ };++}( jQuery ));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.javaindex 0487d60ac9..80e1f78e49 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@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class InfiniteScrollResourceReference extends BaseDependentResourceReference {@@ -19,7 +19,7 @@ public class InfiniteScrollResourceReference extends BaseDependentResourceRefere@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> items = super.getDependencies();- items.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ 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.jsindex 361504f917..2e3039d618 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@@ -57,7 +57,7 @@ onedev.server.infiniteScroll = {} else {$lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/img/ajax-indicator.gif'></img></div>");}- $container.jumpIntoView(".loading-indicator");+ $container.find(".loading-indicator").scrollIntoView();} 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.javaindex 9c331f3142..546fd68f8d 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,7 @@ 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.jumpintoview.JumpIntoViewResourceReference;+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 +24,7 @@ public class InputAssistResourceReference extends BaseDependentResourceReference@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ 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.jsindex feab87c681..ffcf3377b8 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@@ -48,7 +48,7 @@ onedev.server.inputassist = {} else {$dropdown.find("tr:not(.loading-indicator)").last().addClass("active");}- $dropdown.find(".suggestions").jumpIntoView("tr.active");+ $dropdown.find(".suggestions tr.active").scrollIntoView();onedev.server.inputassist.updateHelp($dropdown);$dropdown.align($dropdown.data("alignment"));return false;@@ -68,7 +68,7 @@ onedev.server.inputassist = {} else {$dropdown.find("tr:not(.loading-indicator)").first().addClass("active");}- $dropdown.find(".suggestions").jumpIntoView("tr.active");+ $dropdown.find(".suggestions tr.active").scrollIntoView();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.jsindex e3445f6d5e..a9cce3bfa8 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").jumpIntoView("li.active", 8, 8);+ $container.find("ul.branches li.active").scrollIntoView();});$input.bind("keydown", "down", function(e) {e.preventDefault();@@ -33,7 +33,7 @@ onedev.server.branchSelector = {$next.addClass("active");callback("down");}- $container.find("ul.branches").jumpIntoView("li.active", 8, 8);+ $container.find("ul.branches li.active").scrollIntoView();});}};\ No newline at end of filediff --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.javaindex e288c8c27d..98682cc43f 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,7 +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.scrollintoview.ScrollIntoViewResourceReference;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;@@ -29,7 +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(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));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.jsindex 7e69f5f6ba..ea8ce6b836 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@@ -618,7 +618,7 @@ onedev.server.textDiff = {var $startTd = markInfo.startTd;var $endTd = markInfo.endTd;if ($startTd && $endTd)- $startTd.scrollParent().jumpIntoView($startTd);+ $startTd.scrollIntoView();},mark: function($container, mark) {onedev.server.textDiff.clearMark($container);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.htmlindex e35e8527a0..4ea498055e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html@@ -12,6 +12,6 @@</a></li></ul>- <div wicket:id="noProjects" class="no-projects">No Projects Found</div>+ <div wicket:id="noProjects" class="no-projects autosize">No Projects Found</div></div></wicket:panel>\ No newline at end of filediff --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.javaindex deec8479b8..78dba50796 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,7 @@ 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.jumpintoview.JumpIntoViewResourceReference;+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class ProjectSelectorResourceReference extends BaseDependentResourceReference {@@ -23,7 +23,7 @@ public class ProjectSelectorResourceReference extends BaseDependentResourceReferpublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ 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.css b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.cssindex ebf7c7466f..7e083507fe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css@@ -4,8 +4,8 @@.project-selector .btn {margin-bottom: 12px;}-.project-selector ul, .project-selector .alert {- margin: 12px 0 0 0;+.project-selector ul {+ margin-top: 12px;}.project-selector ul a {padding: 5px 20px !important;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.jsindex dcf370ce5c..6c9b384be9 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");}- $container.find(".projects").jumpIntoView("li.project.active", 30, 8);+ $("li.project.active").scrollIntoView();});$input.bind("keydown", "down", function(e) {@@ -33,7 +33,7 @@ onedev.server.projectSelector = {$active.removeClass("active");$next.addClass("active");}- $container.find(".projects").jumpIntoView("li.project.active", 30, 8);+ $("li.project.active").scrollIntoView();});}};\ No newline at end of filediff --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.jsindex 3836311c21..1524468085 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").jumpIntoView("li.active", 8, 8);+ $container.find("ul.items li.active").scrollIntoView();});$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").jumpIntoView("li.active", 8, 8);+ $container.find("ul.items li.active").scrollIntoView();});}};\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.javaindex 96b5e1a3eb..4c4e39636a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java@@ -13,7 +13,7 @@ import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;-import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -32,7 +32,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));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.jsindex 58bc6776c1..6bf8863d9f 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@@ -252,7 +252,7 @@ onedev.server.sourceView = {syncOutline: function(symbolId) {var $symbol = $("#" + symbolId);var $body = $(".source-view>.outline>.content>.body");- $body.jumpIntoView($symbol, 20, 20);+ $symbol.scrollIntoView(20);$body.find(".tree-content").removeClass("active");$symbol.addClass("active");@@ -618,7 +618,7 @@ onedev.server.sourceView = {var $prev = $selectables.eq(index);$active.removeClass("active");$prev.addClass("active");- $result.jumpIntoView("a.active", 36, 36);+ $result.find("a.active").scrollIntoView(36);}};@@ -633,7 +633,7 @@ onedev.server.sourceView = {var $next = $selectables.eq(index);$active.removeClass("active");$next.addClass("active");- $result.jumpIntoView("a.active", 36, 36);+ $result.find("a.active").scrollIntoView(36);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.javaindex a0f112caaf..57af11c577 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java@@ -8,7 +8,7 @@ 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.jumpintoview.JumpIntoViewResourceReference;+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -23,7 +23,7 @@ public class QuickSearchResourceReference extends BaseDependentResourceReference@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(CssHeaderItem.forReference(diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.jsindex 7ddc0f5fe8..093e4afffc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js@@ -26,7 +26,7 @@ onedev.server.onQuickSearchDomReady = function(containerId, callback) {$active.removeClass("active");$prev.addClass("active");}- $result.jumpIntoView("li.hit.active", 36, 36);+ $result.find("li.hit.active").scrollIntoView(36);};function onKeydown(e) {@@ -38,7 +38,7 @@ onedev.server.onQuickSearchDomReady = function(containerId, callback) {$active.removeClass("active");$next.addClass("active");}- $result.jumpIntoView("li.hit.active", 36, 36);+ $result.find("li.hit.active").scrollIntoView(36);};$body.children().bind("keydown", "return", onReturn);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.javaindex ca07e37183..9e142a88ce 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@@ -134,7 +134,7 @@ public abstract class SearchResultPanel extends Panel {String script = String.format(""+ "$('#%s').find('.selectable').removeClass('active');"+ "$('#%s').addClass('active');"- + "$('#%s>.search-result>.body').jumpIntoView('a.selectable.active', 25, 25);",+ + "$('#%s>.search-result>.body a.selectable.active').scrollIntoView(25);",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.javaindex 76505bb77f..6d11be4cef 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,7 @@ 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.jumpintoview.JumpIntoViewResourceReference;+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 +23,7 @@ public class SearchResultResourceReference extends BaseDependentResourceReferencpublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new URIResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));+ 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/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 40cc1a127a..b19152c540 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -32,6 +33,7 @@ public class TestPage extends BasePage {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));}}