Updated Branches:
  refs/heads/master a6468e37e -> 5e7c2c1ac

WICKET-3367
Rewrite all JavaScript inline event handlers to be proper attached event 
handlers

Expose 'event' as a visible variable for processEvaluation() method. This way 
user's scripts can use the event that caused this Ajax call


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

Branch: refs/heads/master
Commit: 5e7c2c1ac5923b3da56cea0a6680877c5bbfa988
Parents: a6468e3
Author: martin-g <[email protected]>
Authored: Wed Jan 4 10:09:37 2012 +0200
Committer: martin-g <[email protected]>
Committed: Wed Jan 4 10:09:37 2012 +0200

----------------------------------------------------------------------
 .../wicket/ajax/res/js/wicket-ajax-jquery.js       |   10 ++++++++--
 .../ajax/markup/html/AjaxEditableLabel.java        |    4 ++--
 .../markup/html/AjaxEditableMultiLineLabel.java    |    4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/5e7c2c1a/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 aa1470c..a86f391 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
@@ -818,8 +818,14 @@
                        });
                },
 
-               // Adds a closure that evaluates javascript code
-               processEvaluation: function (steps, node, attrs) {
+               /**
+                * Adds a closure that evaluates javascript code.
+                * @param steps {Array} - the steps for FunctionExecutor
+                * @param node {XmlElement} - the <[priority-]evaluate> element 
with the script to evaluate
+                * @param attrs {Object} - the attributes used for the Ajax 
request
+                * @param event {jQuery.Event} - the event that caused this 
Ajax call
+                */
+               processEvaluation: function (steps, node, attrs, event) {
                        steps.push(function (notify) {
                                // get the javascript body
                                var text = jQuery(node).text();

http://git-wip-us.apache.org/repos/asf/wicket/blob/5e7c2c1a/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 2e51233..c51c847 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
@@ -314,7 +314,7 @@ public class AjaxEditableLabel<T> extends Panel
 
                                CharSequence dynamicExtraParameters =
                                                "var result = {}, " +
-                                                               
"kc=Wicket.Event.keyCode(attrs.event)," +
+                                                               
"kc=Wicket.Event.keyCode(event)," +
                                                                
"evtType=attrs.event.type;" +
                                                                "if (evtType 
=== 'keyup') {" +
                                                                // ESCAPE key
@@ -328,7 +328,7 @@ public class AjaxEditableLabel<T> extends Panel
                                
attributes.getDynamicExtraParameters().add(dynamicExtraParameters);
 
                                CharSequence precondition =
-                                               "var 
kc=Wicket.Event.keyCode(attrs.event),"+
+                                               "var 
kc=Wicket.Event.keyCode(event),"+
                                                                
"evtType=attrs.event.type,"+
                                                                "ret=false;"+
                                                                
"if(evtType==='blur' || (evtType==='keyup' && (kc===27 || kc===13))) ret = 
true;"+

http://git-wip-us.apache.org/repos/asf/wicket/blob/5e7c2c1a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
----------------------------------------------------------------------
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
index 5b8654e..3f67447 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
@@ -183,7 +183,7 @@ public class AjaxEditableMultiLineLabel<T> extends 
AjaxEditableLabel<T>
                                attributes.setEventNames("blur", "keyup");
                                CharSequence dynamicExtraParameters =
                                                "var result = {}, " +
-                                                               
"kc=Wicket.Event.keyCode(attrs.event)," +
+                                                               
"kc=Wicket.Event.keyCode(event)," +
                                                                
"evtType=attrs.event.type;" +
                                                                "if (evtType 
=== 'keyup') {" +
                                                                        // 
ESCAPE key
@@ -195,7 +195,7 @@ public class AjaxEditableMultiLineLabel<T> extends 
AjaxEditableLabel<T>
                                dynamicParameters.add(dynamicExtraParameters);
 
                                CharSequence precondition =
-                                               "var 
kc=Wicket.Event.keyCode(attrs.event),"+
+                                               "var 
kc=Wicket.Event.keyCode(event),"+
                                                                
"evtType=attrs.event.type,"+
                                                                "ret=false;"+
                                                                
"if(evtType==='blur' || (evtType==='keyup' && (kc===27))) ret = true;"+

Reply via email to