You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/08/21 10:38:08 UTC
[1/2] git commit: WICKET-5680 no need to serialize form element
explicitly, wicket-ajax does it already
Repository: wicket
Updated Branches:
refs/heads/master c9270888b -> a65fea5a7
WICKET-5680 no need to serialize form element explicitly, wicket-ajax
does it already
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4559da4e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4559da4e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4559da4e
Branch: refs/heads/master
Commit: 4559da4ef9c0c38a9c7092be3785e27611a535a6
Parents: c927088
Author: svenmeier <sv...@meiers.net>
Authored: Thu Aug 21 10:28:51 2014 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Aug 21 10:32:55 2014 +0200
----------------------------------------------------------------------
.../wicket/extensions/ajax/markup/html/AjaxEditableLabel.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4559da4e/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index df62188..2514625 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -348,10 +348,10 @@ public class AjaxEditableLabel<T> extends Panel
AjaxCallListener ajaxCallListener = new AjaxCallListener();
ajaxCallListener.onPrecondition(precondition);
- CharSequence dynamicExtraParameters = "var result = [],"
+ CharSequence dynamicExtraParameters = "var result,"
+ "evtType=attrs.event.type;"
- + "if (evtType === 'keyup') { result.push( { name: 'save', value: false } ); }"
- + "else { result = Wicket.Form.serializeElement(attrs.c); result.push( { name: 'save', value: true } ); }"
+ + "if (evtType === 'keyup') { result = { 'save': false }; }"
+ + "else { result = { 'save': true }; }"
+ "return result;";
attributes.getDynamicExtraParameters().add(dynamicExtraParameters);
[2/2] git commit: WICKET-5680 clear input on cancel
Posted by sv...@apache.org.
WICKET-5680 clear input on cancel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a65fea5a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a65fea5a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a65fea5a
Branch: refs/heads/master
Commit: a65fea5a743d161f1c5c06499f486d38cb5b0623
Parents: 4559da4
Author: svenmeier <sv...@meiers.net>
Authored: Thu Aug 21 10:29:20 2014 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Aug 21 10:33:07 2014 +0200
----------------------------------------------------------------------
.../wicket/extensions/ajax/markup/html/AjaxEditableLabel.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a65fea5a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index 2514625..238e1bd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -474,6 +474,7 @@ public class AjaxEditableLabel<T> extends Panel
{
label.setVisible(true);
editor.setVisible(false);
+ editor.clearInput();
target.add(AjaxEditableLabel.this);
}