ISIS-1224 Upgrade select2 from v3.5.2 to v4, hopefully to address the floating drop-down problem
Fix the path to select2.css dependency Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd2a54bc Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd2a54bc Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd2a54bc Branch: refs/heads/master Commit: bd2a54bc07710637132e1e31fe39889062cf3b8e Parents: 009b930 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Nov 13 19:25:56 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Nov 13 19:25:56 2015 +0100 ---------------------------------------------------------------------- .../widgets/select2/Select2BootstrapCssReference.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/bd2a54bc/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java index 3baa87e..d5d1724 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java @@ -19,11 +19,14 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2; import java.util.List; -import com.google.common.collect.Lists; + import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.CssReferenceHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import org.wicketstuff.select2.Select2Choice; +import org.wicketstuff.select2.ApplicationSettings; + +import com.google.common.collect.Lists; /** * A CSS reference that loads <a href="https://github.com/ivaynberg/select2/";>Select2.css</a> @@ -38,6 +41,7 @@ public class Select2BootstrapCssReference extends CssResourceReference { @Override public List<HeaderItem> getDependencies() { - return Lists.<HeaderItem>newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css"))); + CssReferenceHeaderItem select2CssReference = CssHeaderItem.forReference(new CssResourceReference(ApplicationSettings.class, "res/css/select2.css")); + return Lists.<HeaderItem>newArrayList(select2CssReference); } }
