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

Remove #generateCallbackScript()


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

Branch: refs/heads/master
Commit: 383082b07c38d0896d4a83f98a5e65565a93fd52
Parents: 0ee7fab
Author: martin-g <[email protected]>
Authored: Thu Jan 5 18:43:09 2012 +0200
Committer: martin-g <[email protected]>
Committed: Thu Jan 5 18:43:09 2012 +0200

----------------------------------------------------------------------
 .../wicket/ajax/AbstractDefaultAjaxBehavior.java   |   17 ---------------
 .../AjaxFormChoiceComponentUpdatingBehavior.java   |    4 +-
 2 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/383082b0/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 225b7e5..62921c5 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
@@ -432,23 +432,6 @@ public abstract class AbstractDefaultAjaxBehavior extends 
AbstractAjaxBehavior
        }
 
        /**
-        * Returns javascript that performs an ajax callback to this behavior.
-        * 
-        * @param partialCall
-        *            JavaScript of a partial call to the function performing 
the actual ajax callback.
-        *            Must be in format <code>function(params,</code> with 
signature
-        *            <code>function(params, onSuccessHandler, 
onFailureHandler</code>. Example:
-        *            <code>wicketAjaxGet('callbackurl'</code>
-        * 
-        * @return script that performs ajax callback to this behavior
-        */
-       @Deprecated
-       protected CharSequence generateCallbackScript(final CharSequence 
partialCall)
-       {
-               return "";
-       }
-
-       /**
         * Provides an AjaxChannel for this Behavior.
         * 
         * @return an AjaxChannel - Defaults to null.

http://git-wip-us.apache.org/repos/asf/wicket/blob/383082b0/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
 
b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
index b6ae4a2..f6e4070 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
@@ -139,9 +139,9 @@ public abstract class 
AjaxFormChoiceComponentUpdatingBehavior extends AbstractDe
         */
        protected final CharSequence getEventHandler()
        {
-               return generateCallbackScript(new 
AppendingStringBuffer("Wicket.Ajax.post('").append(
+               return new AppendingStringBuffer("Wicket.Ajax.post('").append(
                        getCallbackUrl()).append(
-                       "', Wicket.Form.serialize('" + 
getComponent().getMarkupId() + "',false)"));
+                       "', Wicket.Form.serialize('" + 
getComponent().getMarkupId() + "',false)");
        }
 
        /**

Reply via email to