Updated Branches: refs/heads/master 3c69194ca -> ae8a88aab
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Remove support for the special "href" event as discussed at http://markmail.org/thread/azqvfogw3l6gwohb Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ae8a88aa Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ae8a88aa Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ae8a88aa Branch: refs/heads/master Commit: ae8a88aab539cf701855c97cf7b312a19b41bbe2 Parents: 021123a Author: martin-g <[email protected]> Authored: Tue Jan 3 18:15:22 2012 +0200 Committer: martin-g <[email protected]> Committed: Tue Jan 3 18:15:22 2012 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/ajax/AjaxEventBehavior.java | 31 +------------- .../form/AjaxFormComponentUpdatingBehavior.java | 11 ----- .../wicket/ajax/form/AjaxFormSubmitBehavior.java | 33 +-------------- .../wicket/ajax/markup/html/form/AjaxButton.java | 21 --------- .../ajax/markup/html/form/AjaxFallbackButton.java | 6 --- .../ajax/markup/html/form/AjaxSubmitLink.java | 6 --- 6 files changed, 2 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java index eaa88e7..c385a90 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java @@ -85,32 +85,12 @@ public abstract class AjaxEventBehavior extends AbstractDefaultAjaxBehavior attributes.setEventNames(event); } - /** - * - * @see org.apache.wicket.behavior.AbstractAjaxBehavior#onComponentTag(org.apache.wicket.markup.ComponentTag) - */ - @Override - protected void onComponentTag(final ComponentTag tag) - { - super.onComponentTag(tag); - - if ("href".equalsIgnoreCase(event)) - { - // only add the event handler when the component is enabled. - if (getComponent().isEnabledInHierarchy()) - { - String value = "javascript:" + getEventHandler(); - tag.put(event, value); - } - } - } - @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - if ("href".equalsIgnoreCase(event) == false && component.isEnabledInHierarchy()) + if (component.isEnabledInHierarchy()) { StringBuilder js = new StringBuilder(); js.append("Wicket.Ajax.ajax("); @@ -133,15 +113,6 @@ public abstract class AjaxEventBehavior extends AbstractDefaultAjaxBehavior /** * - * @return event handler - */ - protected CharSequence getEventHandler() - { - return getCallbackScript(); - } - - /** - * * @param event */ protected void onCheckEvent(final String event) http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java index cbed122..80450c0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java @@ -100,17 +100,6 @@ public abstract class AjaxFormComponentUpdatingBehavior extends AjaxEventBehavio return (FormComponent<?>)getComponent(); } - /** - * @see org.apache.wicket.ajax.AjaxEventBehavior#getEventHandler() - */ - @Override - protected final CharSequence getEventHandler() - { - return generateCallbackScript(new AppendingStringBuffer("Wicket.Ajax.post('").append( - getCallbackUrl()).append( - "', Wicket.Form.serialize('" + getComponent().getMarkupId() + "')")); - } - @Override protected void updateAjaxAttributes(AjaxRequestAttributes attributes) { http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java index 8df4fb2..8e926a5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java @@ -18,14 +18,13 @@ package org.apache.wicket.ajax.form; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxEventBehavior; +import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IFormSubmitter; import org.apache.wicket.markup.html.form.IFormSubmittingComponent; -import org.apache.wicket.util.string.AppendingStringBuffer; /** * Ajax event behavior that submits a form via ajax when the event it is attached to, is invoked. @@ -142,36 +141,6 @@ public abstract class AjaxFormSubmitBehavior extends AjaxEventBehavior } /** - * - * @see org.apache.wicket.ajax.AjaxEventBehavior#getEventHandler() - */ - @Override - protected CharSequence getEventHandler() - { - final String formId = getForm().getMarkupId(); - final CharSequence url = getCallbackUrl(); - - AppendingStringBuffer call = new AppendingStringBuffer("Wicket.Ajax.submitForm('").append( - formId) - .append("', '") - .append(url) - .append("', "); - - if (getComponent() instanceof IFormSubmittingComponent) - { - call.append("'") - .append(((IFormSubmittingComponent)getComponent()).getInputName()) - .append("' "); - } - else - { - call.append("null"); - } - - return generateCallbackScript(call) + ";"; - } - - /** * @see org.apache.wicket.ajax.AjaxEventBehavior#onEvent(org.apache.wicket.ajax.AjaxRequestTarget) */ @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java index ed85eae..137203b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java @@ -116,27 +116,6 @@ public abstract class AjaxButton extends Button /** * - * @see org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#getEventHandler() - */ - @Override - protected CharSequence getEventHandler() - { - final String script = AjaxButton.this.getOnClickScript(); - - AppendingStringBuffer handler = new AppendingStringBuffer(); - - if (!Strings.isEmpty(script)) - { - handler.append(script).append(";"); - } - - handler.append(super.getEventHandler()); - handler.append("; return false;"); - return handler; - } - - /** - * * @see org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getAjaxCallDecorator() */ @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java index 4257cb4..4d37580 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java @@ -84,12 +84,6 @@ public abstract class AjaxFallbackButton extends Button } @Override - protected CharSequence getEventHandler() - { - return new AppendingStringBuffer(super.getEventHandler()).append("; return false;"); - } - - @Override protected IAjaxCallDecorator getAjaxCallDecorator() { return AjaxFallbackButton.this.getAjaxCallDecorator(); http://git-wip-us.apache.org/repos/asf/wicket/blob/ae8a88aa/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java index 1ce7b5c..4f49681 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java @@ -76,12 +76,6 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink } @Override - protected CharSequence getEventHandler() - { - return new AppendingStringBuffer(super.getEventHandler()).append("; return false;"); - } - - @Override protected IAjaxCallDecorator getAjaxCallDecorator() { return AjaxSubmitLink.this.getAjaxCallDecorator();
