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 2017/04/20 10:36:35 UTC

isis git commit: spiking use of x-editable

Repository: isis
Updated Branches:
  refs/heads/ISIS-1603 [created] efc321258


spiking use of x-editable


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/efc32125
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/efc32125
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/efc32125

Branch: refs/heads/ISIS-1603
Commit: efc3212582a2f41f96fffa77aa63eeb674e64d98
Parents: e47aa0b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 19 18:04:26 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 20 09:13:09 2017 +0100

----------------------------------------------------------------------
 core/pom.xml                                    |  7 +++
 core/viewer-wicket-ui/pom.xml                   |  8 ++-
 .../scalars/ScalarPanelTextFieldAbstract.java   |  8 +--
 .../ScalarPanelTextFieldParseableAbstract.java  | 57 +++++++++++++++++++-
 .../components/scalars/string/StringPanel.java  |  1 +
 5 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/efc32125/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 150c5f1..bf60595 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -149,6 +149,7 @@
         <select2.version>4.0.3</select2.version>
 
         <jquery-ui.version>1.11.4</jquery-ui.version>
+        <x-editable.version>1.5.1</x-editable.version>
 
         <guice.version>4.1.0</guice.version>
         <picocontainer.version>2.15</picocontainer.version>
@@ -1626,6 +1627,12 @@ ${license.additional-notes}
 
             <dependency>
                 <groupId>org.webjars</groupId>
+                <artifactId>x-editable-bootstrap</artifactId>
+                <version>${x-editable.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.webjars</groupId>
                 <artifactId>select2</artifactId>
                 <version>${select2.version}</version>
             </dependency>

http://git-wip-us.apache.org/repos/asf/isis/blob/efc32125/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index e2ff0af..43a9353 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -56,6 +56,7 @@
 	</build>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
 			<artifactId>isis-core-viewer-wicket-model</artifactId>
@@ -92,7 +93,12 @@
 			<artifactId>wicketstuff-select2</artifactId>
 		</dependency>
 
-        <dependency>
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>x-editable-bootstrap</artifactId>
+		</dependency>
+
+		<dependency>
             <groupId>org.webjars</groupId>
             <artifactId>select2</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/isis/blob/efc32125/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index e3dbe06..715a681 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -266,8 +266,8 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
     @Override
     protected void onBeforeRenderWhenViewMode() {
         super.onBeforeRenderWhenViewMode();
-        textField.setEnabled(false);
-        addReplaceDisabledTagWithReadonlyTagBehaviourIfRequired(textField);
+//        textField.setEnabled(false);
+//        addReplaceDisabledTagWithReadonlyTagBehaviourIfRequired(textField);
 
         final String disableReasonIfAny = scalarModel.disable(getRendering().getWhere());
         if(disableReasonIfAny == null) {
@@ -281,8 +281,8 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
     @Override
     protected void onBeforeRenderWhenDisabled(final String disableReason) {
         super.onBeforeRenderWhenDisabled(disableReason);
-        textField.setEnabled(false);
-        addReplaceDisabledTagWithReadonlyTagBehaviourIfRequired(textField);
+//        textField.setEnabled(false);
+//        addReplaceDisabledTagWithReadonlyTagBehaviourIfRequired(textField);
         setTitleAttribute(disableReason);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/efc32125/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
index 703a3f8..ea9c7cd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
@@ -19,15 +19,25 @@
 
 package org.apache.isis.viewer.wicket.ui.components.scalars;
 
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.form.AbstractTextComponent;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.validation.validator.StringValidator;
 
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.xeditable.XEditableBehavior;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.xeditable.XEditableOptions;
+import de.agilecoders.wicket.jquery.Key;
+
 /**
  * Adapter for {@link ScalarPanelTextFieldAbstract textField-based scalar panel}
  * s where moreover the scalar parameter or property is a value type that is
@@ -45,7 +55,7 @@ public abstract class ScalarPanelTextFieldParseableAbstract extends ScalarPanelT
 
     @Override
     protected AbstractTextComponent<String> createTextFieldForRegular() {
-        final AbstractTextComponent<String> textField = new TextField<>(idTextField, new Model<String>() {
+        final Model<String> textFieldModel = new Model<String>() {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -61,7 +71,50 @@ public abstract class ScalarPanelTextFieldParseableAbstract extends ScalarPanelT
                     getModel().setObjectAsString(object);
                 }
             }
-        });
+        };
+        final AbstractTextComponent<String> textField = new TextField<>(idTextField, textFieldModel);
+        final XEditableOptions options = new XEditableOptions() {
+            {
+                put(new Key<String>("toggle"), "click");
+            }
+        }.withMode("inline");
+
+        options.withDefaultValue(textFieldModel.getObject());
+
+        XEditableBehavior xEditable = new XEditableBehavior(options) {
+            @Override
+            protected void onSave(final AjaxRequestTarget target, final String value) {
+                textFieldModel.setObject(value);
+                ObjectAdapter adapter = scalarModel.getParentObjectAdapterMemento()
+                        .getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK, getPersistenceSession(),
+                                getSpecificationLoader());
+
+                scalarModel.applyValue(adapter);
+
+                target.add(textField);
+                target.add(getPage());
+
+                options.withDefaultValue(textFieldModel.getObject());
+            }
+
+
+        };
+
+
+        textField.add(xEditable);
+
+        textField.setEnabled(true);
+        textField.add(new Behavior() {
+                @Override public void onComponentTag(final Component component, final ComponentTag tag) {
+                    super.onComponentTag(component, tag);
+                    if (component.isEnabled()) {
+                        return;
+                    }
+                    tag.remove("disabled");
+                    tag.remove("readonly");
+                }
+            });
+
         return textField;
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/efc32125/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
index b832a17..d2b761b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.string;
 
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;