You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/14 10:23:27 UTC
[1/2] git commit: WICKET-5234 OnEventHeaderItem can't be applied via
AJAX
Updated Branches:
refs/heads/wicket-6.x 323db880e -> 2468536a3
WICKET-5234 OnEventHeaderItem can't be applied via AJAX
Transform OnEventHeaderItem to appendJavaScript, as OnLoadHeaderItem and OnDomReadyHeaderItem
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2468536a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2468536a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2468536a
Branch: refs/heads/wicket-6.x
Commit: 2468536a3896c07c7e436d7c4f191d776935c845
Parents: 6ccd27c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 14 11:13:04 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 14 11:14:29 2013 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/ajax/AbstractAjaxResponse.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2468536a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java
index a183ef4..b660edc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java
@@ -29,6 +29,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnEventHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.head.internal.HeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
@@ -534,6 +535,14 @@ public abstract class AbstractAjaxResponse
markItemRendered(item);
}
}
+ else if (item instanceof OnEventHeaderItem)
+ {
+ if (!wasItemRendered(item))
+ {
+ AbstractAjaxResponse.this.appendJavaScript(((OnEventHeaderItem) item).getJavaScript());
+ markItemRendered(item);
+ }
+ }
else if (item instanceof OnDomReadyHeaderItem)
{
if (!wasItemRendered(item))
[2/2] git commit: WICKET-5233 Component.getBehaviors() can be
implemented slightly more efficiently
Posted by mg...@apache.org.
WICKET-5233 Component.getBehaviors() can be implemented slightly more efficiently
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6ccd27ca
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6ccd27ca
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6ccd27ca
Branch: refs/heads/wicket-6.x
Commit: 6ccd27caf22ca63fc37a14f71690e9017c57d07f
Parents: 323db88
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 13 14:56:14 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 14 11:14:29 2013 +0300
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ccd27ca/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 24332c4..8fa63a3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -4521,7 +4521,7 @@ public abstract class Component
*/
public final List<? extends Behavior> getBehaviors()
{
- return getBehaviors(Behavior.class);
+ return getBehaviors(null);
}
}