You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/10/28 07:33:08 UTC
[05/21] isis git commit: ISIS-1224 Upgrade select2 from v3.5.2 to v4,
hopefully to address the floating drop-down problem
ISIS-1224 Upgrade select2 from v3.5.2 to v4, hopefully to address the floating drop-down problem
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c27df44
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c27df44
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c27df44
Branch: refs/heads/master
Commit: 7c27df445e80452ee42ed00f023fea6225f17d22
Parents: d483b2c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 23:43:00 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 23:43:00 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 3 ++-
.../scalars/reference/EntityLinkSelect2Panel.html | 4 ++--
.../ui/components/scalars/reference/ReferencePanel.html | 2 +-
.../widgets/ObjectAdapterMementoProviderAbstract.java | 8 ++++----
.../components/widgets/breadcrumbs/BreadcrumbPanel.html | 2 +-
.../components/widgets/breadcrumbs/BreadcrumbPanel.java | 8 ++++----
.../components/widgets/select2/Select2ChoiceUtil.java | 12 +++++++++++-
.../widgets/valuechoices/ValueChoicesSelect2Panel.html | 4 ++--
.../widgets/valuechoices/ValueChoicesSelect2Panel.java | 2 +-
.../wicket/ui/errors/ExceptionStackTracePanel.html | 9 ++-------
10 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8f481cb..8b0fba2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1586,7 +1586,8 @@ ${license.additional-notes}
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicketstuff.version}</version>
+ <version>7.2.0-SNAPSHOT</version>
+ <!--<version>${wicketstuff.version}</version>-->
<exclusions>
<exclusion>
<!-- for dependency convergence -->
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
index bf0be48..d7265a4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
@@ -19,12 +19,12 @@
-->
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
<wicket:panel>
- <input wicket:id="autoComplete" type="hidden" class="autoComplete form-control select2-remote" style="width: 100%" />
+ <select wicket:id="autoComplete" class="autoComplete form-control select2-remote" style="width: 100%"></select>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 0b92105..975eec6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -19,7 +19,7 @@
-->
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index bb72f1e..1ce0ce7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -22,7 +22,7 @@ import java.util.Locale;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import org.wicketstuff.select2.TextChoiceProvider;
+import org.wicketstuff.select2.ChoiceProvider;
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.IsisConverterLocator;
-public abstract class ObjectAdapterMementoProviderAbstract extends TextChoiceProvider<ObjectAdapterMemento> {
+public abstract class ObjectAdapterMementoProviderAbstract extends ChoiceProvider<ObjectAdapterMemento> {
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
}
@Override
- protected String getDisplayText(final ObjectAdapterMemento choice) {
+ public String getDisplayValue(final ObjectAdapterMemento choice) {
if (choice == null) {
return NULL_DISPLAY_TEXT;
}
@@ -71,7 +71,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
}
@Override
- protected Object getId(final ObjectAdapterMemento choice) {
+ public String getIdValue(final ObjectAdapterMemento choice) {
return choice != null? choice.asString(): NULL_PLACEHOLDER;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index 13d7bdd..87e480b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<span class="breadcrumbPanel">
- <input wicket:id="breadcrumbs" type="hidden" class="autoComplete form-control select2-remote" style="width: 100%" />
+ <select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select>
</span>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 7ba1cd7..1653064 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -24,10 +24,10 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
-import org.wicketstuff.select2.TextChoiceProvider;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -54,17 +54,17 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
final IModel<EntityModel> entityModel = new Model<EntityModel>();
- TextChoiceProvider<EntityModel> choiceProvider = new TextChoiceProvider<EntityModel>() {
+ ChoiceProvider<EntityModel> choiceProvider = new ChoiceProvider<EntityModel>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(EntityModel choice) {
+ public String getDisplayValue(EntityModel choice) {
return breadcrumbModel.titleFor(choice);
}
@Override
- protected Object getId(EntityModel choice) {
+ public String getIdValue(EntityModel choice) {
try {
final PageParameters pageParameters = choice.getPageParameters();
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index 0282e1e..0c059d3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -38,11 +38,21 @@ public final class Select2ChoiceUtil {
return select2Choice;
}
- private static class EmptyChoiceProvider implements ChoiceProvider<ObjectAdapterMemento> {
+ private static class EmptyChoiceProvider extends ChoiceProvider<ObjectAdapterMemento> {
private static final EmptyChoiceProvider INSTANCE = new EmptyChoiceProvider();
@Override
+ public String getDisplayValue(ObjectAdapterMemento object) {
+ return null;
+ }
+
+ @Override
+ public String getIdValue(ObjectAdapterMemento object) {
+ return null;
+ }
+
+ @Override
public void query(String term, int page, Response<ObjectAdapterMemento> response) {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index f1ef0d8..52de953 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -19,7 +19,7 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
@@ -29,7 +29,7 @@
<label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
<div class="scalarValueWrapper">
<div class="choicesPlaceholder">
- <input wicket:id="scalarValue" type="hidden" class="choices form-control input-sm select2-remote" style="width: 99.8%;"/>
+ <select wicket:id="scalarValue" class="choices form-control input-sm select2-remote" style="width: 99.8%;"></select>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 964188d..cbfa213 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -173,7 +173,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
final Predicate<ObjectAdapterMemento> lookupOam = new Predicate<ObjectAdapterMemento>() {
@Override
public boolean apply(ObjectAdapterMemento input) {
- final String id = (String) getId(input);
+ final String id = getIdValue(input);
return ids.contains(id);
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
index 7b649be..79a39af 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
@@ -19,14 +19,9 @@
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
- <head>
- <wicket:link>
- <!--<link href="ExceptionStackTracePanel.css" rel="stylesheet" type="text/css"/>-->
- </wicket:link>
- </head>
<body>
<wicket:panel>
<div class="exceptionStackTracePanel">
@@ -39,7 +34,7 @@
</h2>
</div>
<div class="panel-body" wicket:id="ticketDetailsDiv">
- <h3><span wicket:id="ticketDetails">[ticket details]</span></h3>
+ <h3 wicket:id="ticketDetails">[ticket details]</h3>
</div>
<div class="panel-body" wicket:id="ticketReferenceDiv">
<h4>Please quote reference: <span wicket:id="ticketReference">[ticket reference]</span></h4>