Skip to content

The Unified and Autonomous Development Platform

Refactor autofocus feature

robin shen40678d4df16c
diff --git a/core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.java
new file mode 100644
index 0000000000..57a6b72f07
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/asset/jumpintoview/JumpIntoViewResourceReference.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.asset.jumpintoview;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Application;
+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 {
+
+ private static final long serialVersionUID = 1L;
+
+ public JumpIntoViewResourceReference() {
+ super(JumpIntoViewResourceReference.class, "jquery.jumpintoview.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = new ArrayList<>();
+ dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));
+ return dependencies;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.js b/core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.js
new file mode 100644
index 0000000000..f4dfd62111
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/asset/jumpintoview/jquery.jumpintoview.js
@@ -0,0 +1,33 @@
+/*
+ * 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/core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js b/core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
index 11dc9c0e04..0976007125 100644
--- a/core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
+++ b/core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
@@ -1,33 +1,208 @@
-/*
- * 2015, Robin Shen
+/*!
+ * jQuery scrollintoview() plugin and :scrollable selector filter
+ *
+ * Version 1.8 (14 Jul 2011)
+ * Requires jQuery 1.4 or newer
+ *
+ * Copyright (c) 2011 Robert Koritnik
+ * Licensed under the terms of the MIT license
+ * http://www.opensource.org/licenses/mit-license.php
*/
-(function ( $ ) {
-
- var defaultTopMargin = defaultBottomMargin = 8;
-
- $.fn.scrollIntoView = 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));
+
+(function ($) {
+ var converter = {
+ vertical: { x: false, y: true },
+ horizontal: { x: true, y: false },
+ both: { x: true, y: true },
+ x: { x: true, y: false },
+ y: { x: false, y: true }
+ };
+
+ var settings = {
+ duration: "fast",
+ direction: "both"
+ };
+
+ var rootrx = /^(?:html)$/i;
+
+ // gets border dimensions
+ var borders = function (domElement, styles) {
+ styles = styles || (document.defaultView && document.defaultView.getComputedStyle ? document.defaultView.getComputedStyle(domElement, null) : domElement.currentStyle);
+ var px = document.defaultView && document.defaultView.getComputedStyle ? true : false;
+ var b = {
+ top: (parseFloat(px ? styles.borderTopWidth : $.css(domElement, "borderTopWidth")) || 0),
+ left: (parseFloat(px ? styles.borderLeftWidth : $.css(domElement, "borderLeftWidth")) || 0),
+ bottom: (parseFloat(px ? styles.borderBottomWidth : $.css(domElement, "borderBottomWidth")) || 0),
+ right: (parseFloat(px ? styles.borderRightWidth : $.css(domElement, "borderRightWidth")) || 0)
+ };
+ return {
+ top: b.top,
+ left: b.left,
+ bottom: b.bottom,
+ right: b.right,
+ vertical: b.top + b.bottom,
+ horizontal: b.left + b.right
+ };
+ };
+
+ var dimensions = function ($element) {
+ var win = $(window);
+ var isRoot = rootrx.test($element[0].nodeName);
+ return {
+ border: isRoot ? { top: 0, left: 0, bottom: 0, right: 0} : borders($element[0]),
+ scroll: {
+ top: (isRoot ? win : $element).scrollTop(),
+ left: (isRoot ? win : $element).scrollLeft()
+ },
+ scrollbar: {
+ right: isRoot ? 0 : $element.innerWidth() - $element[0].clientWidth,
+ bottom: isRoot ? 0 : $element.innerHeight() - $element[0].clientHeight
+ },
+ rect: (function () {
+ var r = $element[0].getBoundingClientRect();
+ return {
+ top: isRoot ? 0 : r.top,
+ left: isRoot ? 0 : r.left,
+ bottom: isRoot ? $element[0].clientHeight : r.bottom,
+ right: isRoot ? $element[0].clientWidth : r.right
+ };
+ })()
+ };
+ };
+
+ $.fn.extend({
+ scrollIntoView: function (options) {
+ /// <summary>Scrolls the first element in the set into view by scrolling its closest scrollable parent.</summary>
+ /// <param name="options" type="Object">Additional options that can configure scrolling:
+ /// duration (default: "fast") - jQuery animation speed (can be a duration string or number of milliseconds)
+ /// direction (default: "both") - select possible scrollings ("vertical" or "y", "horizontal" or "x", "both")
+ /// complete (default: none) - a function to call when scrolling completes (called in context of the DOM element being scrolled)
+ /// </param>
+ /// <return type="jQuery">Returns the same jQuery set that this function was run on.</return>
+
+ options = $.extend({}, settings, options);
+ options.direction = converter[typeof (options.direction) === "string" && options.direction.toLowerCase()] || converter.both;
+
+ var dirStr = "";
+ if (options.direction.x === true) dirStr = "horizontal";
+ if (options.direction.y === true) dirStr = dirStr ? "both" : "vertical";
+
+ var el = this.eq(0);
+ var scroller = el.closest(":scrollable(" + dirStr + ")");
+
+ // check if there's anything to scroll in the first place
+ if (scroller.length > 0)
+ {
+ scroller = scroller.eq(0);
+
+ var dim = {
+ e: dimensions(el),
+ s: dimensions(scroller)
+ };
+
+ var rel = {
+ top: dim.e.rect.top - (dim.s.rect.top + dim.s.border.top),
+ bottom: dim.s.rect.bottom - dim.s.border.bottom - dim.s.scrollbar.bottom - dim.e.rect.bottom,
+ left: dim.e.rect.left - (dim.s.rect.left + dim.s.border.left),
+ right: dim.s.rect.right - dim.s.border.right - dim.s.scrollbar.right - dim.e.rect.right
+ };
+
+ var animOptions = {};
+
+ // vertical scroll
+ if (options.direction.y === true)
+ {
+ if (rel.top < 0)
+ {
+ animOptions.scrollTop = dim.s.scroll.top + rel.top;
+ }
+ else if (rel.top > 0 && rel.bottom < 0)
+ {
+ animOptions.scrollTop = dim.s.scroll.top + Math.min(rel.top, -rel.bottom);
+ }
+ }
+
+ // horizontal scroll
+ if (options.direction.x === true)
+ {
+ if (rel.left < 0)
+ {
+ animOptions.scrollLeft = dim.s.scroll.left + rel.left;
+ }
+ else if (rel.left > 0 && rel.right < 0)
+ {
+ animOptions.scrollLeft = dim.s.scroll.left + Math.min(rel.left, -rel.right);
+ }
+ }
+
+ // scroll if needed
+ if (!$.isEmptyObject(animOptions))
+ {
+ if (rootrx.test(scroller[0].nodeName))
+ {
+ scroller = $("html,body");
+ }
+ scroller
+ .animate(animOptions, options.duration)
+ .eq(0) // we want function to be called just once (ref. "html,body")
+ .queue(function (next) {
+ $.isFunction(options.complete) && options.complete.call(scroller[0]);
+ next();
+ });
+ }
+ else
+ {
+ // when there's nothing to scroll, just call the "complete" function
+ $.isFunction(options.complete) && options.complete.call(scroller[0]);
+ }
+ }
+
+ // return set back
+ return this;
+ }
+ });
+
+ var scrollValue = {
+ auto: true,
+ scroll: true,
+ visible: false,
+ hidden: false
+ };
+
+ $.extend($.expr[":"], {
+ scrollable: function (element, index, meta, stack) {
+ var direction = converter[typeof (meta[3]) === "string" && meta[3].toLowerCase()] || converter.both;
+ var styles = (document.defaultView && document.defaultView.getComputedStyle ? document.defaultView.getComputedStyle(element, null) : element.currentStyle);
+ var overflow = {
+ x: scrollValue[styles.overflowX.toLowerCase()] || false,
+ y: scrollValue[styles.overflowY.toLowerCase()] || false,
+ isRoot: rootrx.test(element.nodeName)
+ };
+
+ // check if completely unscrollable (exclude HTML element because it's special)
+ if (!overflow.x && !overflow.y && !overflow.isRoot)
+ {
+ return false;
+ }
+
+ var size = {
+ height: {
+ scroll: element.scrollHeight,
+ client: element.clientHeight
+ },
+ width: {
+ scroll: element.scrollWidth,
+ client: element.clientWidth
+ },
+ // check overflow.x/y because iPad (and possibly other tablets) don't dislay scrollbars
+ scrollableX: function () {
+ return (overflow.x || overflow.isRoot) && this.width.scroll > this.width.client;
+ },
+ scrollableY: function () {
+ return (overflow.y || overflow.isRoot) && this.height.scroll > this.height.client;
+ }
+ };
+ return direction.y && size.scrollableY() || direction.x && size.scrollableX();
}
-
- return this;
- };
-
-}( jQuery ));
+ });
+})(jQuery);
diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
index 80e1f78e49..0487d60ac9 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
+++ b/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class InfiniteScrollResourceReference extends BaseDependentResourceReference {
@@ -19,7 +19,7 @@ public class InfiniteScrollResourceReference extends BaseDependentResourceRefere
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> items = super.getDependencies();
- items.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
+ items.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
return items;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
index f59dac7153..2a7fa0f10f 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js
@@ -36,7 +36,7 @@ onedev.infiniteScroll = {
var colspan = $lastItem.children().length;
$lastItem.parent().append("<tr class='loading-indicator'><td colspan='" + colspan + "'><img src='/img/ajax-indicator.gif'></img></td></tr>");
}
- $container.scrollIntoView(".loading-indicator");
+ $container.jumpIntoView(".loading-indicator");
$container.data("callback")(page);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java
index 546fd68f8d..9c331f3142 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java
+++ b/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
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
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
index b740f797f1..b466bb5231 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
@@ -59,7 +59,7 @@ onedev.server.inputassist = {
} else {
$dropdown.find("tr:not(.loading-indicator)").last().addClass("active");
}
- $dropdown.find(".suggestions").scrollIntoView("tr.active");
+ $dropdown.find(".suggestions").jumpIntoView("tr.active");
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
@@ -79,7 +79,7 @@ onedev.server.inputassist = {
} else {
$dropdown.find("tr:not(.loading-indicator)").first().addClass("active");
}
- $dropdown.find(".suggestions").scrollIntoView("tr.active");
+ $dropdown.find(".suggestions").jumpIntoView("tr.active");
onedev.server.inputassist.updateHelp($dropdown);
$dropdown.align($dropdown.data("alignment"));
return false;
diff --git a/core/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js b/core/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js
index 39f6f644d9..e3445f6d5e 100644
--- a/core/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js
+++ b/core/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js
@@ -22,7 +22,7 @@ onedev.server.branchSelector = {
$prev.addClass("active");
callback("up");
}
- $container.find("ul.branches").scrollIntoView("li.active", 8, 8);
+ $container.find("ul.branches").jumpIntoView("li.active", 8, 8);
});
$input.bind("keydown", "down", function(e) {
e.preventDefault();
@@ -33,7 +33,7 @@ onedev.server.branchSelector = {
$next.addClass("active");
callback("down");
}
- $container.find("ul.branches").scrollIntoView("li.active", 8, 8);
+ $container.find("ul.branches").jumpIntoView("li.active", 8, 8);
});
}
};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html b/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html
index f7e8080644..21065c427d 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html
@@ -10,7 +10,7 @@
</div>
<div class="modal-body">
<div wicket:id="message" class="message"></div>
- <input class="form-control autofocus confirm"></input>
+ <input class="form-control confirm"></input>
</div>
<div class="modal-footer">
<input wicket:id="delete" type="submit" class="btn btn-danger" disabled="disabled" value="Delete"></input>
diff --git a/core/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html b/core/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html
index 5e42876d64..be931578eb 100644
--- a/core/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html
@@ -6,7 +6,7 @@
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
- <input wicket:id="name" class="form-control autofocus">
+ <input wicket:id="name" class="form-control">
</div>
<div class="modal-footer">
<button wicket:id="create" class="btn btn-primary">Create</button>
diff --git a/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html b/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
index 04163aef38..12faa2989f 100644
--- a/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html
@@ -9,12 +9,12 @@
<wicket:enclosure child="name">
<div class="form-group">
<label>Tag Name *</label>
- <input wicket:id="name" class="form-control autofocus">
+ <input wicket:id="name" class="form-control">
</div>
</wicket:enclosure>
<div class="form-group">
<label>Tag Message</label>
- <textarea wicket:id="message" rows="10" class="form-control autofocus"></textarea>
+ <textarea wicket:id="message" rows="10" class="form-control"></textarea>
</div>
</div>
<div class="modal-footer">
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
index e438ba38e2..488418243f 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js
@@ -39,7 +39,7 @@ onedev.server.revisionDiff = {
if ($(window).scrollTop() <= detailOffset) {
$(window).scrollTop(detailOffset);
}
- $anchor.closest(".code-comment").parent().scrollIntoView($anchor);
+ $anchor.closest(".code-comment").parent().jumpIntoView($anchor);
}, 100);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
index d9565addfc..088934b203 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
@@ -14,12 +14,12 @@
<div wicket:id="feedback" class="feedback"></div>
<div class="form-group">
<label wicket:id="urlLabel" class="control-label"></label>
- <input wicket:id="url" class="form-control autofocus url"></input>
+ <input wicket:id="url" class="form-control url"></input>
<p wicket:id="urlHelp" class="help-block"></p>
</div>
<div class="form-group">
<label wicket:id="textLabel" class="control-label"></label>
- <input wicket:id="text" class="form-control autofocus text"></input>
+ <input wicket:id="text" class="form-control text"></input>
</div>
<div class="actions clearfix">
<button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary pull-right">Insert</button>
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index ec0d5a2539..0e5a721205 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -62,7 +62,7 @@
</div>
<div class="body clearfix">
<div wicket:id="edit" class="edit">
- <textarea wicket:id="input" class="autofocus"></textarea>
+ <textarea wicket:id="input"></textarea>
<div class="ui-resizable-handle ui-resizable-s"></div>
</div>
<div wicket:id="preview" class="preview">
diff --git a/core/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java b/core/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java
index 765406ab58..33b8259b1a 100644
--- a/core/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/projectselector/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class ProjectSelectorResourceReference extends BaseDependentResourceReference {
@@ -23,7 +23,7 @@ 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(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ProjectSelectorResourceReference.class, "project-selector.css")));
return dependencies;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js b/core/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js
index b8d359760e..dcf370ce5c 100644
--- a/core/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js
+++ b/core/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js
@@ -22,7 +22,7 @@ onedev.server.projectSelector = {
$active.removeClass("active");
$prev.addClass("active");
}
- $container.find(".projects").scrollIntoView("li.project.active", 30, 8);
+ $container.find(".projects").jumpIntoView("li.project.active", 30, 8);
});
$input.bind("keydown", "down", function(e) {
@@ -33,7 +33,7 @@ onedev.server.projectSelector = {
$active.removeClass("active");
$next.addClass("active");
}
- $container.find(".projects").scrollIntoView("li.project.active", 30, 8);
+ $container.find(".projects").jumpIntoView("li.project.active", 30, 8);
});
}
};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js b/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
index feb8abbbc8..3836311c21 100644
--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
+++ b/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").scrollIntoView("li.active", 8, 8);
+ $container.find("ul.items").jumpIntoView("li.active", 8, 8);
});
$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").scrollIntoView("li.active", 8, 8);
+ $container.find("ul.items").jumpIntoView("li.active", 8, 8);
});
}
};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java b/core/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java
index 169a7e8f71..76ecb52cd4 100644
--- a/core/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java
@@ -14,7 +14,7 @@ public class Select2ResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
public Select2ResourceReference() {
- super(Select2ResourceReference.class, "res/select2-patched.js");
+ super(Select2ResourceReference.class, "res/select2.js");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/select2/res/select2-patched.js b/core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
similarity index 99%
rename from core/src/main/java/io/onedev/server/web/component/select2/res/select2-patched.js
rename to core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
index 847544d2bc..093d7fbd7e 100644
--- a/core/src/main/java/io/onedev/server/web/component/select2/res/select2-patched.js
+++ b/core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
@@ -1580,10 +1580,10 @@ the specific language governing permissions and limitations under the Apache Lic
" <span></span><abbr class='select2-search-choice-close' style='display:none;'></abbr>",
" <div><b></b></div>" ,
"</a>",
- "<input class='select2-focusser autofocus select2-offscreen' type='text'/>",
+ "<input class='select2-focusser select2-offscreen' type='text'/>",
"<div class='select2-drop' style='display:none'>" ,
" <div class='select2-search'>" ,
- " <input type='text' autocomplete='off' class='autofocus select2-input'/>" ,
+ " <input type='text' autocomplete='off' class='select2-input'/>" ,
" </div>" ,
" <ul class='select2-results'>" ,
" </ul>" ,
@@ -2048,7 +2048,7 @@ the specific language governing permissions and limitations under the Apache Lic
" <ul class='select2-choices'>",
//"<li class='select2-search-choice'><span>California</span><a href="javascript:void(0)" class="select2-search-choice-close"></a></li>" ,
" <li class='select2-search-field'>" ,
- " <input type='text' autocomplete='off' class='autofocus select2-input'>" ,
+ " <input type='text' autocomplete='off' class='select2-input'>" ,
" </li>" ,
"</ul>" ,
"<div class='select2-drop select2-drop-multi' style='display:none;'>" ,
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index bd8336d975..bb89f5b377 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.editable;
import java.util.Set;
+import javax.annotation.Nullable;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
@@ -9,6 +10,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
@@ -47,7 +49,23 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
});
- add(new AttributeAppender("class", " property editor editable"));
+ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String classes = "property editor editable ";
+ if (hasErrors(true) && getErrorClass() != null)
+ classes += getErrorClass();
+ return classes;
+ }
+
+ }));
+
+ }
+
+ @Nullable
+ protected String getErrorClass() {
+ return "has-error";
}
protected void onPropertyUpdating(IPartialPageRequestHandler target) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
index 05444f0a53..bcd2a032d8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
@@ -113,6 +113,11 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {
return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);
}
+ @Override
+ protected String getErrorClass() {
+ return null;
+ }
+
@Override
protected Serializable convertInputToValue() throws ConversionException {
Component beanEditor = get(BEAN_EDITOR_ID);
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 7e04543006..1edf682ed9 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -123,6 +123,11 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
add(newListEditor(list));
}
+ @Override
+ protected String getErrorClass() {
+ return null;
+ }
+
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java
index 4d453d250d..9cee88328b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java
@@ -2,10 +2,8 @@ package io.onedev.server.web.editable.bool;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -38,19 +36,6 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {
});
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
index 9f027efa4f..f1f79f769d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
@@ -2,10 +2,8 @@ package io.onedev.server.web.editable.bool;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -53,18 +51,6 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {
}
});
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html
index 0334e8b15c..2f485da3da 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
index 7faccb4e15..4dcf4c38b8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
@@ -1,10 +1,8 @@
package io.onedev.server.web.editable.branchpattern;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -41,19 +39,6 @@ public class BranchPatternEditor extends PropertyEditor<String> {
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.html
index fa55bad696..a62a3bcf51 100644
--- a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="hidden" class="form-control autofocus"></input>
+ <input wicket:id="input" type="hidden" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java
index bd6235e111..47b41b776e 100644
--- a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java
@@ -2,9 +2,7 @@ package io.onedev.server.web.editable.color;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -39,18 +37,6 @@ public class ColorPropertyEditor extends PropertyEditor<String> {
}
});
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html
index 00478ee0e3..f05080a070 100644
--- a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="text" class="form-control autofocus"></input>
+ <input wicket:id="input" type="text" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java
index 56f0e5ce37..00e9b375e1 100644
--- a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java
@@ -6,10 +6,8 @@ import java.util.Date;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -57,18 +55,6 @@ public class DatePropertyEditor extends PropertyEditor<Date> {
});
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
index 4bcf0a381d..36c7692c5a 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
@@ -10,11 +10,9 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -95,19 +93,6 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
});
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
index fb9ba8b5ea..91e20c2664 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
@@ -11,9 +11,7 @@ import java.util.List;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import org.json.JSONException;
@@ -110,19 +108,6 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
}
});
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
add(input);
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html
index 2206db9051..4f0915f59f 100644
--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" autocomplete="off" spellcheck="false" class="autofocus form-control"></input>
+ <input wicket:id="input" autocomplete="off" spellcheck="false" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java
index 640c02167d..95022e0048 100644
--- a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java
@@ -1,9 +1,7 @@
package io.onedev.server.web.editable.markdown;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -28,18 +26,6 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {
add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, null));
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html
index 00478ee0e3..f05080a070 100644
--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="text" class="form-control autofocus"></input>
+ <input wicket:id="input" type="text" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java
index 05edb8927b..f37dc20d39 100644
--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java
@@ -2,10 +2,8 @@ package io.onedev.server.web.editable.numeric;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -40,18 +38,6 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {
}
});
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
index 6c45fc03d7..e783054ffc 100644
--- a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.editable.password;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -47,19 +46,6 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
input.add(AttributeAppender.append("autocomplete", autoComplete));
inputAgain.add(AttributeAppender.append("autocomplete", autoComplete));
}
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html
index cb9a278dfa..bc53e94ad2 100644
--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="password" autocomplete="new-password" class="form-control autofocus"></input>
+ <input wicket:id="input" type="password" autocomplete="new-password" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
index 97f0a527af..e219f11a37 100644
--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.editable.password;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -37,18 +36,6 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {
String autoComplete = password.autoComplete();
if (StringUtils.isNotBlank(autoComplete))
input.add(AttributeAppender.append("autocomplete", autoComplete));
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html
index 0334e8b15c..2f485da3da 100644
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
index 4fa97ecb40..ae89c5e2d3 100644
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
@@ -1,10 +1,8 @@
package io.onedev.server.web.editable.pathpattern;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -41,19 +39,6 @@ public class PathPatternEditor extends PropertyEditor<String> {
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
index c8fc6892e5..d616663115 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
@@ -2,7 +2,7 @@
<div wicket:id="content" class="polymorphic"></div>
<wicket:fragment wicket:id="verticalFrag">
<div wicket:id="typeSelectorContainer" class="type-selector">
- <select wicket:id="typeSelector" class="form-control autofocus"></select>
+ <select wicket:id="typeSelector" class="form-control"></select>
</div>
<div wicket:id="beanEditor"></div>
</wicket:fragment>
@@ -10,7 +10,7 @@
<table>
<tbody>
<tr>
- <td wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control autofocus"></select></td>
+ <td wicket:id="typeSelectorContainer" class="type-selector"><select wicket:id="typeSelector" class="form-control"></select></td>
<td><div wicket:id="beanEditor"></div></td>
</tr>
</tbody>
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
index 66b9dc5fc8..ae3b780c3f 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
@@ -170,6 +170,11 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
fragment.add(newBeanEditor(getModelObject()));
}
+ @Override
+ protected String getErrorClass() {
+ return null;
+ }
+
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
index a642f5ac75..a810d7db11 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
@@ -19,7 +19,7 @@
</table>
<wicket:fragment wicket:id="horizontalFrag">
<td class="type-selector">
- <select wicket:id="elementTypeSelector" class="form-control autofocus"></select>
+ <select wicket:id="elementTypeSelector" class="form-control"></select>
</td>
<td>
<div wicket:id="elementEditor"></div>
@@ -33,7 +33,7 @@
<wicket:fragment wicket:id="verticalFrag">
<td>
<div class="type-selector">
- <select wicket:id="elementTypeSelector" class="form-control autofocus"></select>
+ <select wicket:id="elementTypeSelector" class="form-control"></select>
</div>
<div wicket:id="elementEditor"></div>
<div wicket:id="feedback"></div>
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
index 5d2b8d09d8..b824de30e0 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
@@ -138,6 +138,11 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
add(newListEditor(list));
}
+ @Override
+ protected String getErrorClass() {
+ return null;
+ }
+
private Component newListEditor(List<Serializable> list) {
final WebMarkupContainer table = new WebMarkupContainer("listEditor");
if (horizontal)
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
index 0334e8b15c..2f485da3da 100644
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
index b89fb17b94..76b0486ad1 100644
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
@@ -1,9 +1,7 @@
package io.onedev.server.web.editable.reviewrequirementspec;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -40,19 +38,6 @@ public class ReviewRequirementSpecEditor extends PropertyEditor<String> {
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html
index fa28cd1f80..801c187dbc 100644
--- a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div wicket:id="container" class="script-support autofocus">
+ <div wicket:id="container" class="script-support">
<textarea wicket:id="input"></textarea>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
index e44a9347b3..4ce6647205 100644
--- a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
@@ -1,13 +1,11 @@
package io.onedev.server.web.editable.script;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -35,18 +33,6 @@ public class ScriptPropertyEditor extends PropertyEditor<String> {
container.add(input = new TextArea<String>("input", Model.of(getModelObject())));
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.setOutputMarkupId(true);
-
- container.add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css b/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
index a0eef97504..8f0b186186 100644
--- a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
+++ b/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
@@ -3,7 +3,7 @@
border-radius: 4px;
padding: 1px;
}
-.script-support.has-error {
+.has-error .script-support {
border-color: #a94442;
}
.script-support .CodeMirror {
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html
index f8e55121eb..668457c1ed 100644
--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div wicket:id="content"></div>
<wicket:fragment wicket:id="singleLineFrag">
- <input wicket:id="input" type="text" class="form-control autofocus"></input>
+ <input wicket:id="input" type="text" class="form-control"></input>
</wicket:fragment>
<wicket:fragment wicket:id="multiLineFrag">
- <textarea wicket:id="input" class="form-control autofocus" rows="4"></textarea>
+ <textarea wicket:id="input" class="form-control" rows="4"></textarea>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
index e029f7e31b..0071235c13 100644
--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
@@ -5,13 +5,11 @@ import java.lang.reflect.Method;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -61,18 +59,6 @@ public class StringPropertyEditor extends PropertyEditor<String> {
if (getter.getAnnotation(OmitName.class) != null)
input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html
index 0334e8b15c..2f485da3da 100644
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control autofocus"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
index a78eb5fc7a..33bdbfe6d7 100644
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
@@ -1,10 +1,8 @@
package io.onedev.server.web.editable.tagpattern;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -42,19 +40,6 @@ public class TagPatternEditor extends PropertyEditor<String> {
}));
add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index a70eea0b47..f8fe39628d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -81,8 +81,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
}
});
-
- add(input);
+ add(input);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html b/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html
index f4c24ef016..56d8dcb640 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html
@@ -43,7 +43,7 @@
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
- <textarea wicket:id="licenseKey" rows="10" class="form-control autofocus"></textarea>
+ <textarea wicket:id="licenseKey" rows="10" class="form-control"></textarea>
<p class="help-block">License key can be generated from account at
<a href="https://www.onedev.io">onedev.io</a>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java b/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
index 586f44aa00..8769fb4027 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java
@@ -14,6 +14,7 @@ import io.onedev.server.web.asset.areyousure.AreYouSureResourceReference;
import io.onedev.server.web.asset.autosize.AutoSizeResourceReference;
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,6 +35,7 @@ public class BaseResourceReference extends JavaScriptResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new AreYouSureResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseCssResourceReference()));
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.js
index 70a5062bff..4ef329b731 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -292,22 +292,27 @@ onedev.server = {
* via Wicket
*/
setTimeout(function() {
- var selector = ".has-error:visible:first .autofocus";
- var $inError = $containers.find(selector).addBack(selector);
- if ($inError.length != 0 && $inError.closest(".no-autofocus").length == 0) {
- if ($inError.children(".CodeMirror").length != 0) {
- $inError.children(".CodeMirror")[0].CodeMirror.focus();
- } else if (!$inError.hasClass("select2-input") && !$inError.hasClass("select2-offscreen")) {
- $inError.focus();
+ var focusibleSelector = "input[type=text]:visible, input:not([type]):visible, textarea:visible, .CodeMirror:visible";
+
+ var inErrorSelector = ".has-error:visible:first";
+ var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);
+ if ($inError.length != 0) {
+ var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector);
+ if ($focusable.hasClass("CodeMirror")) {
+ $focusable[0].CodeMirror.focus();
+ } else if ($focusable.length != 0) {
+ $focusable.focus();
+ } else {
+ $focusable.scrollIntoView();
}
} else {
- selector = ".autofocus:visible";
- $containers.find(selector).addBack(selector).each(function() {
+ $containers.find(focusibleSelector).addBack(focusibleSelector).each(function() {
var $this = $(this);
+ console.log($this[0]);
if ($this.closest(".no-autofocus").length == 0) {
- if ($this.children(".CodeMirror").length != 0) {
- $this.children(".CodeMirror")[0].CodeMirror.focus();
- } else if (!$this.hasClass("select2-input") && !$this.hasClass("select2-offscreen")) {
+ if ($this.hasClass("CodeMirror")) {
+ $this[0].CodeMirror.focus();
+ } else {
$this.focus();
}
return false;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index d66be6092e..f39da15692 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -271,8 +271,8 @@ public class BlobNavigator extends Panel {
});
- if (context.getMode() == Mode.ADD)
- nameInput.add(AttributeAppender.append("class", "autofocus"));
+ if (context.getMode() != Mode.ADD)
+ nameInput.add(AttributeAppender.append("class", "no-autofocus"));
lastSegment.add(AttributeAppender.append("class", "input"));
} else if (file.isTree()) {
lastSegment = new WebMarkupContainer(LAST_SEGMENT_ID);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
index effcb61bb4..a515687d5d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
@@ -113,7 +113,7 @@ onedev.server.projectBlob = {
// Scroll anchors into view (for instance the markdown headline)
var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];
if (element)
- element.scrollIntoView();
+ element.jumpIntoView();
}
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
index 345f5197a0..53d0b7d693 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -5,6 +5,7 @@ import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -117,6 +118,9 @@ public abstract class BlobEditPanel extends Panel {
});
+ if (context.getMode() == Mode.ADD)
+ add(AttributeAppender.append("class", "no-autofocus"));
+
setOutputMarkupId(true);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index c31045828a..5ecd298453 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -54,9 +54,8 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
});
- if (context.getMode() != Mode.EDIT) {
+ if (context.getMode() != Mode.EDIT)
input.add(AttributeAppender.append("class", "no-autofocus"));
- }
input.setOutputMarkupId(true);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
index 333cc6974f..2aaab3388c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
@@ -34,7 +34,7 @@
<h4 class="modal-title">Outline Search</h4>
</div>
<div class="modal-body">
- <input wicket:id="input" class="form-control autofocus"></input>
+ <input wicket:id="input" class="form-control"></input>
<div wicket:id="result" class="result"></div>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
index 4c4e39636a..96b5e1a3eb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
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 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 JumpIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
index 9a71d02b1f..55b4a82093 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -248,7 +248,7 @@ onedev.server.sourceView = {
syncOutline: function(symbolId) {
var $symbol = $("#" + symbolId);
var $body = $(".source-view>.outline>.content>.body");
- $body.scrollIntoView($symbol, 20, 20);
+ $body.jumpIntoView($symbol, 20, 20);
$body.find(".tree-content").removeClass("active");
$symbol.addClass("active");
@@ -615,7 +615,7 @@ onedev.server.sourceView = {
var $prev = $selectables.eq(index);
$active.removeClass("active");
$prev.addClass("active");
- $result.scrollIntoView("a.active", 36, 36);
+ $result.jumpIntoView("a.active", 36, 36);
}
};
@@ -630,7 +630,7 @@ onedev.server.sourceView = {
var $next = $selectables.eq(index);
$active.removeClass("active");
$next.addClass("active");
- $result.scrollIntoView("a.active", 36, 36);
+ $result.jumpIntoView("a.active", 36, 36);
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
index a1bb863a35..7703b68a1c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
@@ -16,7 +16,7 @@
<wicket:fragment wicket:id="symbolSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
@@ -36,7 +36,7 @@
<wicket:fragment wicket:id="fileSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
@@ -52,7 +52,7 @@
<wicket:fragment wicket:id="textSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control autofocus" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
<div wicket:id="feedback"></div>
</div>
<div class="form-group">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
index 67ec0331c0..1c0414a7a5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html
@@ -5,7 +5,7 @@
<h4 class="modal-title">File and Symbol Search</h4>
</div>
<div class="modal-body">
- <input wicket:id="input" class="form-control autofocus"></input>
+ <input wicket:id="input" class="form-control"></input>
<div wicket:id="result" class="result">
<wicket:enclosure child="symbolHits">
<ul class="list-unstyled">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java
index 57af11c577..a0f112caaf 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java
+++ b/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
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
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(CssHeaderItem.forReference(
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js
index 6c3ce80c3d..7ddc0f5fe8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js
+++ b/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.scrollIntoView("li.hit.active", 36, 36);
+ $result.jumpIntoView("li.hit.active", 36, 36);
};
function onKeydown(e) {
@@ -38,7 +38,7 @@ onedev.server.onQuickSearchDomReady = function(containerId, callback) {
$active.removeClass("active");
$next.addClass("active");
}
- $result.scrollIntoView("li.hit.active", 36, 36);
+ $result.jumpIntoView("li.hit.active", 36, 36);
};
$body.children().bind("keydown", "return", onReturn);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index a14559db01..3234623631 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/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').scrollIntoView('a.selectable.active', 25, 25);",
+ + "$('#%s>.search-result>.body').jumpIntoView('a.selectable.active', 25, 25);",
getMarkupId(), activeLinkId, getMarkupId());
target.appendJavaScript(script);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java
index 6d11be4cef..76505bb77f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java
+++ b/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.scrollintoview.ScrollIntoViewResourceReference;
+import io.onedev.server.web.asset.jumpintoview.JumpIntoViewResourceReference;
import io.onedev.server.web.asset.uri.URIResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -23,7 +23,7 @@ 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(JavaScriptHeaderItem.forReference(new JumpIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new CssResourceReference(SearchResultResourceReference.class, "search-result.css")));
return dependencies;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 6f5f1495d9..ed573198bf 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -70,7 +70,7 @@
<div wicket:id="feedback"></div>
<div class="form-group">
<label>Branch Name *</label>
- <input wicket:id="name" class="form-control autofocus">
+ <input wicket:id="name" class="form-control">
</div>
<div class="form-group">
<label>Create From *</label>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html
index c9e2e037cf..aa535df995 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html
@@ -70,7 +70,7 @@
<tr class="title">
<td class="name">Title <span class="required"></span></td>
<td wicket:id="title" class="value">
- <input wicket:id="title" type="text" class="form-control autofocus" placeholder="Input title here">
+ <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">
<div wicket:id="feedback"></div>
</td>
</tr>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html
index 599a06ba9f..90aee88e36 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html
@@ -5,7 +5,7 @@
<div wicket:id="number" class="number pull-left"></div>
<a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>
<form wicket:id="editForm" class="pull-left form-inline">
- <input wicket:id="title" type="text" placeholder="Input title" class="form-control autofocus"></input>
+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>
<input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>
<input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index deab6b5671..b4664cd5b8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -49,7 +49,7 @@
<div wicket:id="feedback"></div>
<div class="form-group">
<label>Tag Name *</label>
- <input wicket:id="name" class="form-control autofocus">
+ <input wicket:id="name" class="form-control">
</div>
<div class="form-group">
<label>Tag Message</label>
diff --git a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html
index 2c89d5348e..7ab93c9faa 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.html
@@ -5,7 +5,7 @@
<form wicket:id="form" method="post">
<div class="input-group username">
<span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
- <input wicket:id="userName" autocomplete="username" type="text" class="form-control input-lg autofocus" placeholder="User name" />
+ <input wicket:id="userName" autocomplete="username" type="text" class="form-control input-lg" placeholder="User name" />
</div>
<div class="input-group password">
<span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
diff --git a/core/src/main/java/io/onedev/server/web/page/test/Bean.java b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
index f1e1c244aa..25882bd889 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/Bean.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
@@ -1,19 +1,39 @@
package io.onedev.server.web.page.test;
import java.io.Serializable;
+import java.util.List;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Color;
import io.onedev.server.util.editable.annotation.Editable;
+import io.onedev.server.util.editable.annotation.Script;
@Editable
public class Bean implements Serializable {
private static final long serialVersionUID = 1L;
+ private String script;
+
private String color;
private String state;
+ @Editable(order=50)
+ @Script
+ @NotEmpty
+ public String getScript() {
+ return script;
+ }
+
+ public void setScript(String script) {
+ this.script = script;
+ }
+
@Editable(order=100)
@Color
public String getColor() {
@@ -25,6 +45,8 @@ public class Bean implements Serializable {
}
@Editable(order=200)
+ @ChoiceProvider("getStateChoices")
+ @NotEmpty
public String getState() {
return state;
}
@@ -33,4 +55,8 @@ public class Bean implements Serializable {
this.state = state;
}
+ @SuppressWarnings("unused")
+ private static List<String> getStateChoices() {
+ return Lists.newArrayList("a", "b", "c");
+ }
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 3861deb6fa..be9be52862 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -2,8 +2,54 @@
<div class="center-box">
<form wicket:id="form">
<div wicket:id="editor"></div>
- <button type="submit" class="btn btn-default">Submit</button>
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <p>1
+ <button wicket:id="submit" type="submit" class="btn btn-default">Submit</button>
</form>
- <div wicket:id="viewer"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 6b387c208a..d1d0a84612 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -2,8 +2,14 @@ package io.onedev.server.web.page.test;
import java.io.Serializable;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.cycle.RequestCycle;
+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.base.BasePage;
@@ -15,11 +21,26 @@ public class TestPage extends BasePage {
super.onInitialize();
Serializable bean = new Bean();
- Form<?> form = new Form<Void>("form");
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(this);
+ }
+
+ };
form.add(BeanContext.editBean("editor", bean));
+ form.add(new AjaxButton("submit") {});
+ form.setOutputMarkupId(true);
add(form);
-
- add(BeanContext.viewBean("viewer", bean));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
}
}