You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/09/29 14:28:34 UTC

git commit: removed event handler "on" prefix

Repository: wicket
Updated Branches:
  refs/heads/master 0eb596df3 -> 602e21b39


removed event handler "on" prefix

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

Branch: refs/heads/master
Commit: 602e21b39a0ead4d5a4a7010acd3958cd0ed6130
Parents: 0eb596d
Author: svenmeier <sv...@meiers.net>
Authored: Mon Sep 29 14:27:44 2014 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Mon Sep 29 14:27:44 2014 +0200

----------------------------------------------------------------------
 .../org/apache/wicket/util/tester/BaseWicketTester.java |  4 ++--
 .../test/java/org/apache/wicket/BehaviorUrlTest.java    |  4 ++--
 .../src/test/java/org/apache/wicket/TestDetachPage.java |  2 +-
 .../org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java |  7 +++----
 .../apache/wicket/ajax/AjaxHeaderContributionTest.java  |  4 ++--
 .../java/org/apache/wicket/ajax/DomReadyOrderTest.java  |  4 ++--
 .../wicket/ajax/form/AjaxFormSubmitBehaviorTest.java    |  2 +-
 .../ajax/form/AjaxFormSubmitBehaviorTestPage.java       |  2 +-
 .../org/apache/wicket/ajax/form/AjaxFormSubmitTest.java |  2 +-
 .../wicket/ajax/markup/html/form/AjaxButtonTest.java    |  2 +-
 .../wicket/markup/html/HeaderContributorTest.java       |  2 +-
 .../markup/html/form/FormWithMultipleButtonsTest.java   |  2 +-
 .../markup/html/form/validation/HomePageTest.java       | 10 +++++-----
 .../wicket/protocol/http/WebResponseExceptionsTest.java |  2 +-
 .../wicket/request/handler/PageIdPoliticTest.java       |  2 +-
 .../MockPageWithFormAndAjaxFormSubmitBehavior.java      |  2 +-
 .../org/apache/wicket/util/tester/WicketTesterTest.java | 12 +++++-------
 .../apache/wicket/util/tester/apps_7/TestHomePage.java  |  2 +-
 .../extensions/ajax/markup/html/AjaxEditableLabel.java  |  2 +-
 .../ajax/markup/html/AjaxEditableMultiLineLabel.java    |  2 +-
 .../extensions/ajax/markup/html/AjaxEditableTest.java   |  2 +-
 21 files changed, 35 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 46eff32..e749e1c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1148,7 +1148,7 @@ public class BaseWicketTester
 	 */
 	public Url urlFor(final AjaxLink<?> link)
 	{
-		AbstractAjaxBehavior behavior = WicketTesterHelper.findAjaxEventBehavior(link, "onclick");
+		AbstractAjaxBehavior behavior = WicketTesterHelper.findAjaxEventBehavior(link, "click");
 		Url url = Url.parse(behavior.getCallbackUrl().toString(),
 			Charset.forName(request.getCharacterEncoding()));
 		return transform(url);
@@ -1849,7 +1849,7 @@ public class BaseWicketTester
 			request.getPostParameters().setParameterValue(pageRelativePath, "x");
 
 			submitAjaxFormSubmitBehavior(link,
-				(AjaxFormSubmitBehavior)WicketTesterHelper.findAjaxEventBehavior(link, "onclick"));
+				(AjaxFormSubmitBehavior)WicketTesterHelper.findAjaxEventBehavior(link, "click"));
 		}
 		/*
 		 * If the link is a submitlink then we pretend to have clicked it

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
index e30d6a3..c0bcb93 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
@@ -152,7 +152,7 @@ public class BehaviorUrlTest extends WicketTestCase
 //		System.err.println(response);
 		assertTrue(response.contains(EscapeTestPage.TEST_QUERY_STRING));
 
-		tester.executeAjaxEvent("form:textfield", "onchange");
+		tester.executeAjaxEvent("form:textfield", "change");
 
 		EscapeTestPage testPage = (EscapeTestPage)tester.getLastRenderedPage();
 		IRequestParameters lastParameters = testPage.getLastQueryParameters();
@@ -169,7 +169,7 @@ public class BehaviorUrlTest extends WicketTestCase
 		/** */
 		public EscapeTestPage()
 		{
-			getTextField().add(new AjaxEventBehavior("onchange")
+			getTextField().add(new AjaxEventBehavior("change")
 			{
 				private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/TestDetachPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPage.java b/wicket-core/src/test/java/org/apache/wicket/TestDetachPage.java
index 0c4e20f..bee3ce9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPage.java
@@ -106,7 +106,7 @@ public class TestDetachPage extends WebPage
 			}
 		};
 		label.setOutputMarkupId(true);
-		ajaxEventBehavior = new AjaxEventBehavior("onclick")
+		ajaxEventBehavior = new AjaxEventBehavior("click")
 		{
 			/** for serialization. */
 			private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
index 509570e..50b0650 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java
@@ -16,10 +16,9 @@
  */
 package org.apache.wicket.ajax;
 
-import org.junit.Assert;
-
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
+import org.junit.Assert;
 
 /**
  * @author marrink
@@ -35,7 +34,7 @@ public class AjaxBehaviorEnabledPage extends WebPage
 	public AjaxBehaviorEnabledPage()
 	{
 		Label enabled = new Label("enabled", "this label is ajax enabled");
-		enabled.add(new AjaxEventBehavior("onclick")
+		enabled.add(new AjaxEventBehavior("click")
 		{
 
 			private static final long serialVersionUID = 1L;
@@ -49,7 +48,7 @@ public class AjaxBehaviorEnabledPage extends WebPage
 		add(enabled);
 		Label disabled = new Label("disabled", "this label is not ajax enabled");
 		disabled.setEnabled(false);
-		disabled.add(new AjaxEventBehavior("onclick")
+		disabled.add(new AjaxEventBehavior("click")
 		{
 			private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
index 3232436..76281b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
@@ -34,7 +34,7 @@ public class AjaxHeaderContributionTest extends WicketTestCase
 		tester.assertResultPage(AjaxHeaderContributionPage.class,
 			"AjaxHeaderContributionPage_expected.html");
 
-		tester.executeAjaxEvent("link", "onclick");
+		tester.executeAjaxEvent("link", "click");
 		tester.assertResultPage(AjaxHeaderContributionPage.class,
 			"AjaxHeaderContributionPage_ajax_expected.html");
 
@@ -50,7 +50,7 @@ public class AjaxHeaderContributionTest extends WicketTestCase
 		tester.assertResultPage(AjaxHeaderContributionPage2.class,
 			"AjaxHeaderContributionPage2_expected.html");
 
-		tester.executeAjaxEvent("link", "onclick");
+		tester.executeAjaxEvent("link", "click");
 		tester.assertResultPage(AjaxHeaderContributionPage2.class,
 			"AjaxHeaderContributionPage2_ajax_expected.html");
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
index ac9f25c..77c9a8f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
@@ -51,7 +51,7 @@ public class DomReadyOrderTest extends WicketTestCase
 		tester.startPage(DomReadyOrderPage.class);
 		tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_expected.html");
 
-		tester.executeAjaxEvent("test", "onclick");
+		tester.executeAjaxEvent("test", "click");
 		tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_ajax_expected.html");
 	}
 
@@ -73,7 +73,7 @@ public class DomReadyOrderTest extends WicketTestCase
 		tester.assertLabel("form:listViewContainer:listView:0:label", "0");
 
 		// add a row, execute ajax
-		tester.executeAjaxEvent("form:addButton", "onclick");
+		tester.executeAjaxEvent("form:addButton", "click");
 
 		// assert rendered page class
 		tester.assertRenderedPage(HomePage.class);

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
index 83d01cb..63bf7ba 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java
@@ -37,7 +37,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase
 		// assert rendered page class
 		AjaxFormSubmitBehaviorTestPage homePage = (AjaxFormSubmitBehaviorTestPage)tester.getLastRenderedPage();
 		TestForm testForm = homePage.getForm();
-		tester.executeAjaxEvent(testForm.getTextField(), "onchange");
+		tester.executeAjaxEvent(testForm.getTextField(), "change");
 		assertTrue(testForm.isSubmitedByAjaxBehavior());
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTestPage.java
index 33e8de7..4ffa327 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTestPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTestPage.java
@@ -60,7 +60,7 @@ class TestForm extends Form<Void>
 	{
 		super(id);
 		textField = new TextField<String>("textField", new Model<String>());
-		textField.add(new AjaxFormSubmitBehavior("onchange")
+		textField.add(new AjaxFormSubmitBehavior("change")
 		{
 			private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
index d167395..23e0b79 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
@@ -46,7 +46,7 @@ public class AjaxFormSubmitTest extends WicketTestCase
 		// mark the button as the one being pressed. there is a ':' infront of name because wicket
 		// escapes "submit" input names as they break browsers
 		tester.getRequest().getPostParameters().setParameterValue(":submit", "x");
-		tester.executeAjaxEvent("form:submit", "onclick");
+		tester.executeAjaxEvent("form:submit", "click");
 		AjaxFormSubmitTestPage page = (AjaxFormSubmitTestPage)tester.getLastRenderedPage();
 		assertFalse((page.getFormSubmitted() & AjaxFormSubmitTestPage.FORM) == AjaxFormSubmitTestPage.FORM);
 		assertTrue((page.getFormSubmitted() & AjaxFormSubmitTestPage.BUTTON) == AjaxFormSubmitTestPage.BUTTON);

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
index 3a0f39f..121927c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java
@@ -47,6 +47,6 @@ public class AjaxButtonTest extends WicketTestCase
 		tester.getRequest()
 			.getPostParameters()
 			.setParameterValue(homePage.getForm().getSubmitButton().getInputName(), "x");
-		tester.executeAjaxEvent(testForm.getSubmitButton(), "onclick");
+		tester.executeAjaxEvent(testForm.getSubmitButton(), "click");
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
index 49d54eb..4431d48 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java
@@ -72,7 +72,7 @@ public class HeaderContributorTest extends WicketTestCase
 		 */
 		public HeaderContributorTestPage()
 		{
-			add(new AjaxEventBehavior("ondummy")
+			add(new AjaxEventBehavior("dummy")
 			{
 				private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
index 0c65fe6..197914d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
@@ -60,7 +60,7 @@ public class FormWithMultipleButtonsTest extends WicketTestCase
 	{
 		TestPage testPage = new TestPage();
 		tester.startPage(testPage);
-		tester.executeAjaxEvent(testPage.ajaxFallbackButton, "onclick");
+		tester.executeAjaxEvent(testPage.ajaxFallbackButton, "click");
 		assertEquals(0, testPage.submitSequence.indexOf(testPage.ajaxFallbackButton));
 		assertEquals(1, testPage.submitSequence.indexOf(testPage.form));
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
index 4cef9d5..1f0e55f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
@@ -45,7 +45,7 @@ public class HomePageTest extends WicketTestCase
 	@Test
 	public void withoutBorder()
 	{
-		tester.executeAjaxEvent("form:submit", "onclick");
+		tester.executeAjaxEvent("form:submit", "click");
 		assertEquals("Expected one error message",
 			tester.getMessages(FeedbackMessage.ERROR).size(), 2);
 		assertTrue(((HomePage)tester.getLastRenderedPage()).hitOnError);
@@ -60,7 +60,7 @@ public class HomePageTest extends WicketTestCase
 	{
 		FormTester formTester = tester.newFormTester("form");
 		formTester.setValue("textfield1", "testxxx");
-		tester.executeAjaxEvent("form:submit", "onclick");
+		tester.executeAjaxEvent("form:submit", "click");
 		tester.assertNoErrorMessage();
 		assertFalse(((HomePage)tester.getLastRenderedPage()).hitOnError);
 		assertTrue(((HomePage)tester.getLastRenderedPage()).hitOnSubmit);
@@ -72,7 +72,7 @@ public class HomePageTest extends WicketTestCase
 	@Test
 	public void withBorder()
 	{
-		tester.executeAjaxEvent("border:form2:submit", "onclick");
+		tester.executeAjaxEvent("border:form2:submit", "click");
 		assertEquals("Expected one error message",
 			tester.getMessages(FeedbackMessage.ERROR).size(), 2);
 		assertTrue(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnError);
@@ -90,7 +90,7 @@ public class HomePageTest extends WicketTestCase
 		tester.getRequest()
 			.getPostParameters()
 			.setParameterValue(textfield.getInputName(), "abcde");
-		tester.executeAjaxEvent("border:form2:submit", "onclick");
+		tester.executeAjaxEvent("border:form2:submit", "click");
 		tester.assertNoErrorMessage();
 		assertFalse(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnError);
 		assertTrue(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnSubmit);
@@ -102,7 +102,7 @@ public class HomePageTest extends WicketTestCase
 	@Test
 	public void withPanelAjax()
 	{
-		tester.executeAjaxEvent("form3:submit", "onclick");
+		tester.executeAjaxEvent("form3:submit", "click");
 
 		HomePage page = (HomePage)tester.getLastRenderedPage();
 		assertFalse((page.getFormSubmitted() & HomePage.AJAX) == HomePage.AJAX);

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
index 7128e8a..20be01b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
@@ -91,7 +91,7 @@ public class WebResponseExceptionsTest extends WicketTestCase
 		tester.setExposeExceptions(false);
 		AjaxLink<?> link = (AjaxLink<?>)tester.getComponentFromLastRenderedPage("link");
 
-		tester.executeAjaxEvent(link, "onclick");
+		tester.executeAjaxEvent(link, "click");
 		assertEquals(500, tester.getLastResponse().getStatus());
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
index 38d974f..117b935 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
@@ -137,7 +137,7 @@ public class PageIdPoliticTest extends Assert
 		{
 			WebComponent component;
 			component = new WebComponent("component");
-			component.add(eventBehavior = new AjaxEventBehavior("onclick")
+			component.add(eventBehavior = new AjaxEventBehavior("click")
 			{
 				/** */
 				private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
index a6766e0..8132265 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
@@ -57,7 +57,7 @@ public class MockPageWithFormAndAjaxFormSubmitBehavior extends WebPage
 		// The Event behavior
 		WebComponent eventComponent = new WebComponent(EVENT_COMPONENT);
 		add(eventComponent);
-		eventComponent.add(new AjaxFormSubmitBehavior(form, "onclick")
+		eventComponent.add(new AjaxFormSubmitBehavior(form, "click")
 		{
 			private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index 8754fc2..4021302 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -266,7 +266,7 @@ public class WicketTesterTest extends WicketTestCase
 			false);
 		try
 		{
-			tester.executeAjaxEvent("ajaxLinkWithSetResponsePageClass", "onclick");
+			tester.executeAjaxEvent("ajaxLinkWithSetResponsePageClass", "click");
 			throw new RuntimeException("Disabled link should not be clickable.");
 		}
 		catch (AssertionError _)
@@ -578,7 +578,7 @@ public class WicketTesterTest extends WicketTestCase
 		final MockPageWithOneComponent page = new MockPageWithOneComponent();
 
 		Label label = new Label("component", "Dblclick This To See Magick");
-		label.add(new AjaxEventBehavior("ondblclick")
+		label.add(new AjaxEventBehavior("dblclick")
 		{
 			private static final long serialVersionUID = 1L;
 
@@ -596,7 +596,7 @@ public class WicketTesterTest extends WicketTestCase
 // tester.setupRequestAndResponse();
 
 		// Execute the event
-		tester.executeAjaxEvent(label, "ondblclick");
+		tester.executeAjaxEvent(label, "dblclick");
 
 		assertTrue(eventExecuted);
 	}
@@ -673,8 +673,7 @@ public class WicketTesterTest extends WicketTestCase
 		tester.getRequest().getPostParameters().setParameterValue(name.getInputName(), "Mock name");
 
 		// Execute the ajax event
-		tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT,
-			"onclick");
+		tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT, "click");
 
 		assertTrue("AjaxFormSubmitBehavior.onSubmit() has not been executed in " +
 			MockPageWithFormAndAjaxFormSubmitBehavior.class, page.isExecuted());
@@ -699,8 +698,7 @@ public class WicketTesterTest extends WicketTestCase
 		tester.startPage(MockPageWithFormAndAjaxFormSubmitBehavior.class);
 		FormTester form = tester.newFormTester("form");
 		form.setValue("name", "New name");
-		tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT,
-				"onclick");
+		tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT, "click");
 
 		MockPageWithFormAndAjaxFormSubmitBehavior page = (MockPageWithFormAndAjaxFormSubmitBehavior)tester.getLastRenderedPage();
 		Pojo pojo = page.getPojo();

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
index 213807c..649a7e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java
@@ -37,6 +37,6 @@ public class TestHomePage extends WicketTestCase
 			"If you see this message wicket is properly configured and running");
 
 		// execute ajax
-		tester.executeAjaxEvent("form:ajaxButton", "onclick");
+		tester.executeAjaxEvent("form:ajaxButton", "click");
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/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 238e1bd..e3aa2fd 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
@@ -411,7 +411,7 @@ public class AjaxEditableLabel<T> extends Panel
 	}
 
 	/**
-	 * By default this returns "onclick" uses can overwrite this on which event the label behavior
+	 * By default this returns "click", users can overwrite this on which event the label behavior
 	 * should be triggered
 	 * 
 	 * @return The event name

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/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 aa72d88..71edc2f 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
@@ -111,7 +111,7 @@ public class AjaxEditableMultiLineLabel<T> extends AjaxEditableLabel<T>
 	}
 
 	/**
-	 * By default this returns "onclick" uses can overwrite this on which event the label behavior
+	 * By default this returns "click", users can overwrite this on which event the label behavior
 	 * should be triggered
 	 * 
 	 * @return The event name

http://git-wip-us.apache.org/repos/asf/wicket/blob/602e21b3/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
index b2a5914..5a95ce1 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
@@ -130,7 +130,7 @@ public class AjaxEditableTest extends WicketTestCase
 		tester.assertLabel("ajaxLabel:label", "ajaxTest");
 
 		// click on the label to go to edit mode
-		tester.executeAjaxEvent("ajaxLabel:label", "onclick");
+		tester.executeAjaxEvent("ajaxLabel:label", "click");
 
 		tester.assertVisible("ajaxLabel:editor");
 		tester.assertInvisible("ajaxLabel:label");