Updated Branches: refs/heads/master f75dd1f6d -> 406246d1d
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Render just a string value for the event name if there is just one event to listen to. This saves few bytes for the Ajax attributes. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/406246d1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/406246d1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/406246d1 Branch: refs/heads/master Commit: 406246d1dfe0508a460d3f77bd560bf58306f8dd Parents: f75dd1f Author: martin-g <[email protected]> Authored: Mon Jan 2 18:26:52 2012 +0200 Committer: martin-g <[email protected]> Committed: Mon Jan 2 18:26:52 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/AbstractDefaultAjaxBehavior.java | 11 ++++++++--- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/406246d1/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java index 15eb352..d868940 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java @@ -336,9 +336,14 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior } String[] eventNames = attributes.getEventNames(); - for (String eventName : eventNames) - { - attributesJson.append("e", eventName); + if (eventNames.length == 1) { + attributesJson.put("e", eventNames[0]); + } + else { + for (String eventName : eventNames) + { + attributesJson.append("e", eventName); + } } AjaxChannel channel = attributes.getChannel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/406246d1/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index 23f06a3..532818e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -1425,6 +1425,10 @@ var target = attrs.c || window; var events = attrs.e || [ 'domready' ]; + if (!jQuery.isArray(events)) { + events = [ events ]; + } + jQuery.each(events, function (idx, evt) { Wicket.Event.add(target, evt, function (jqEvent) { var call = new Wicket.Ajax.Call();
