You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/11/24 09:51:55 UTC
[1/2] wicket git commit: [WICKET-6497] wicket-event-jquery.js and
wicket-ajax-jquery.js are merged, references are updated
Repository: wicket
Updated Branches:
refs/heads/master 0769a6002 -> ba74ad849
[WICKET-6497] wicket-event-jquery.js and wicket-ajax-jquery.js are merged, references are updated
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0f767eb5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0f767eb5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0f767eb5
Branch: refs/heads/master
Commit: 0f767eb5e169739893602a8c236921d150643728
Parents: d3da4e1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 22 22:24:17 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 22 22:24:17 2017 +0700
----------------------------------------------------------------------
testing/wicket-js-tests/Gruntfile.js | 1 -
.../ajax/WicketAjaxJQueryResourceReference.java | 9 +-
.../WicketEventJQueryResourceReference.java | 69 -----
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 272 ++++++++++++++++
.../wicket/ajax/res/js/wicket-event-jquery.js | 308 -------------------
.../markup/head/OnDomReadyHeaderItem.java | 16 +-
.../wicket/markup/head/OnEventHeaderItem.java | 14 +-
.../wicket/markup/head/OnLoadHeaderItem.java | 14 +-
.../markup/html/form/AbstractCheckSelector.java | 14 +-
.../resource/CoreLibrariesContributor.java | 10 +-
.../settings/JavaScriptLibrarySettings.java | 26 +-
.../apache/wicket/TestDetachPageAjaxResult.html | 1 -
.../wicket/TestDetachPageExpectedResult.html | 1 -
.../ajax/AjaxBehaviorEnabled_expected.html | 1 -
...axHeaderContributionPage2_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage2_expected.html | 3 +-
...jaxHeaderContributionPage_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage_expected.html | 1 -
.../ajax/DomReadyOrderPage_ajax_expected.html | 1 -
.../wicket/ajax/DomReadyOrderPage_expected.html | 1 -
.../form/AjaxFormSubmitTestPage_expected.html | 1 -
.../OnChangeAjaxBehaviorTestPage_expected.html | 1 -
.../ajaxLink/AjaxLinkPageExpectedResult.html | 1 -
.../AjaxLinkWithBorderPageExpectedResult.html | 1 -
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 1 -
.../SimpleTestPageExpectedResult-1.html | 1 -
.../SimpleTestPageExpectedResult.html | 1 -
.../html/basic/SimplePageExpectedResult_13.html | 1 -
.../HideableBorderPage_ExpectedResult.html | 1 -
.../panel/InlinePanelPageExpectedResult_7.html | 1 -
.../panel/InlinePanelPageExpectedResult_8.html | 1 -
.../ResourceAggregatorTest1Page_results.html | 2 +-
.../ResourceAggregatorTest2Page_results.html | 2 +-
wicket-core/src/test/js/all.html | 1 -
wicket-core/src/test/js/amd.html | 3 +-
wicket-core/src/test/js/amd.js | 4 +-
36 files changed, 323 insertions(+), 466 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/testing/wicket-js-tests/Gruntfile.js
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/Gruntfile.js b/testing/wicket-js-tests/Gruntfile.js
index 29b746b..82ecb90 100644
--- a/testing/wicket-js-tests/Gruntfile.js
+++ b/testing/wicket-js-tests/Gruntfile.js
@@ -18,7 +18,6 @@ module.exports = function(grunt) {
var
coreJs = [
- '../../wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js',
'../../wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js',
'../../wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js',
"../../wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckSelector.js",
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
index cd6e617..2ed5b88 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
@@ -23,6 +23,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.resource.JQueryResourceReference;
/**
* @author hoeve
@@ -49,17 +50,17 @@ public class WicketAjaxJQueryResourceReference extends JavaScriptResourceReferen
@Override
public List<HeaderItem> getDependencies()
{
- final ResourceReference wicketEventReference;
+ final ResourceReference jqueryReference;
if (Application.exists())
{
- wicketEventReference = Application.get().getJavaScriptLibrarySettings().getWicketEventReference();
+ jqueryReference = Application.get().getJavaScriptLibrarySettings().getJQueryReference();
}
else
{
- wicketEventReference = WicketEventJQueryResourceReference.get();
+ jqueryReference = JQueryResourceReference.getV2();
}
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+ dependencies.add(JavaScriptHeaderItem.forReference(jqueryReference));
return dependencies;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
deleted file mode 100644
index 99212ad..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.ajax;
-
-import java.util.List;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.resource.DynamicJQueryResourceReference;
-import org.apache.wicket.resource.JQueryResourceReference;
-
-/**
- * @author hoeve
- */
-public class WicketEventJQueryResourceReference extends JavaScriptResourceReference
-{
- private static final long serialVersionUID = -2918665261694523156L;
-
- private static final WicketEventJQueryResourceReference INSTANCE = new WicketEventJQueryResourceReference();
-
- /**
- * @return the singleton INSTANCE
- */
- public static WicketEventJQueryResourceReference get()
- {
- return INSTANCE;
- }
-
- private WicketEventJQueryResourceReference()
- {
- super(AbstractDefaultAjaxBehavior.class, "res/js/wicket-event-jquery.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies()
- {
- final ResourceReference backingLibraryReference;
- if (Application.exists())
- {
- backingLibraryReference = Application.get()
- .getJavaScriptLibrarySettings()
- .getJQueryReference();
- }
- else
- {
- backingLibraryReference = DynamicJQueryResourceReference.get();
- }
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
- return dependencies;
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/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 b7ae6fd..1a1379a 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
@@ -2761,6 +2761,278 @@
}
});
+
+ jQuery.extend(true, Wicket, {
+
+ Browser: {
+ _isKHTML: null,
+ isKHTML: function () {
+ var wb = Wicket.Browser;
+ if (wb._isKHTML === null) {
+ wb._isKHTML = (/Konqueror|KHTML/).test(window.navigator.userAgent) && !/Apple/.test(window.navigator.userAgent);
+ }
+ return wb._isKHTML;
+ },
+
+ _isSafari: null,
+ isSafari: function () {
+ var wb = Wicket.Browser;
+ if (wb._isSafari === null) {
+ wb._isSafari = !/Chrome/.test(window.navigator.userAgent) && /KHTML/.test(window.navigator.userAgent) && /Apple/.test(window.navigator.userAgent);
+ }
+ return wb._isSafari;
+ },
+
+ _isChrome: null,
+ isChrome: function () {
+ var wb = Wicket.Browser;
+ if (wb._isChrome === null) {
+ wb._isChrome = (/KHTML/).test(window.navigator.userAgent) && /Apple/.test(window.navigator.userAgent) && /Chrome/.test(window.navigator.userAgent);
+ }
+ return wb._isChrome;
+ },
+
+ _isOpera: null,
+ isOpera: function () {
+ var wb = Wicket.Browser;
+ if (wb._isOpera === null) {
+ wb._isOpera = !Wicket.Browser.isSafari() && typeof(window.opera) !== "undefined";
+ }
+ return wb._isOpera;
+ },
+
+ _isIE: null,
+ isIE: function () {
+ var wb = Wicket.Browser;
+ if (wb._isIE === null) {
+ wb._isIE = !Wicket.Browser.isSafari() && (typeof(document.all) !== "undefined" || window.navigator.userAgent.indexOf("Trident/")>-1) && typeof(window.opera) === "undefined";
+ }
+ return wb._isIE;
+ },
+
+ _isIEQuirks: null,
+ isIEQuirks: function () {
+ var wb = Wicket.Browser;
+ if (wb._isIEQuirks === null) {
+ // is the browser internet explorer in quirks mode (we could use document.compatMode too)
+ wb._isIEQuirks = Wicket.Browser.isIE() && window.document.documentElement.clientHeight === 0;
+ }
+ return wb._isIEQuirks;
+ },
+
+ _isIELessThan9: null,
+ isIELessThan9: function () {
+ var wb = Wicket.Browser;
+ if (wb._isIELessThan9 === null) {
+ var index = window.navigator.userAgent.indexOf("MSIE");
+ var version = parseFloat(window.navigator.userAgent.substring(index + 5));
+ wb._isIELessThan9 = Wicket.Browser.isIE() && version < 9;
+ }
+ return wb._isIELessThan9;
+ },
+
+ _isIELessThan11: null,
+ isIELessThan11: function () {
+ var wb = Wicket.Browser;
+ if (wb._isIELessThan11 === null) {
+ wb._isIELessThan11 = !Wicket.Browser.isSafari() && typeof(document.all) !== "undefined" && typeof(window.opera) === "undefined";
+ }
+ return wb._isIELessThan11;
+ },
+
+ _isIE11: null,
+ isIE11: function () {
+ var wb = Wicket.Browser;
+ if (wb._isIE11 === null) {
+ var userAgent = window.navigator.userAgent;
+ var isTrident = userAgent.indexOf("Trident") > -1;
+ var is11 = userAgent.indexOf("rv:11") > -1;
+ wb._isIE11 = isTrident && is11;
+ }
+ return wb._isIE11;
+ },
+
+ _isGecko: null,
+ isGecko: function () {
+ var wb = Wicket.Browser;
+ if (wb._isGecko === null) {
+ wb._isGecko = (/Gecko/).test(window.navigator.userAgent) && !Wicket.Browser.isSafari();
+ }
+ return wb._isGecko;
+ }
+ },
+
+ /**
+ * Events related code
+ * Based on code from Mootools (http://mootools.net)
+ */
+ Event: {
+ idCounter: 0,
+
+ getId: function (element) {
+ var $el = jQuery(element),
+ id = $el.prop("id");
+
+ if (typeof(id) === "string" && id.length > 0) {
+ return id;
+ } else {
+ id = "wicket-generated-id-" + Wicket.Event.idCounter++;
+ $el.prop("id", id);
+ return id;
+ }
+ },
+
+ keyCode: function (evt) {
+ return Wicket.Event.fix(evt).keyCode;
+ },
+
+ /**
+ * Prevent event from bubbling up in the element hierarchy.
+ * @param evt {Event} - the event to stop
+ * @param immediate {Boolean} - true if the event should not be handled by other listeners registered
+ * on the same HTML element. Optional
+ */
+ stop: function (evt, immediate) {
+ evt = Wicket.Event.fix(evt);
+ if (immediate) {
+ evt.stopImmediatePropagation();
+ } else {
+ evt.stopPropagation();
+ }
+ return evt;
+ },
+
+ /**
+ * If no event is given as argument (IE), window.event is returned.
+ */
+ fix: function (evt) {
+ return jQuery.event.fix(evt || window.event);
+ },
+
+ fire: function (element, event) {
+ event = (event === 'mousewheel' && Wicket.Browser.isGecko()) ? 'DOMMouseScroll' : event;
+ jQuery(element).trigger(event);
+ },
+
+ /**
+ * Binds an event listener for an element
+ *
+ * Also supports the special 'domready' event on window.
+ * 'domready' is event fired when the DOM is complete, but
+ * before loading external resources (images, scripts, ...)
+ *
+ * @param element {HTMLElement} The host HTML element
+ * @param type {String} The type of the DOM event
+ * @param fn {Function} The event handler to unbind
+ * @param data {Object} Extra data for the event
+ * @param selector {String} A selector string to filter the descendants of the selected
+ * elements that trigger the event. If the selector is null or omitted,
+ * the event is always triggered when it reaches the selected element.
+ */
+ add: function (element, type, fn, data, selector) {
+ if (type === 'domready') {
+ jQuery(fn);
+ } else if (type === 'load' && element === window) {
+ jQuery(window).on('load', function() {
+ jQuery(fn);
+ });
+ } else {
+ type = (type === 'mousewheel' && Wicket.Browser.isGecko()) ? 'DOMMouseScroll' : type;
+ var el = element;
+ if (typeof(element) === 'string') {
+ el = document.getElementById(element);
+ }
+
+ if (!el && Wicket.Log) {
+ Wicket.Log.error('Cannot bind a listener for event "' + type +
+ '" on element "' + element + '" because the element is not in the DOM');
+ }
+
+ jQuery(el).on(type, selector, data, fn);
+ }
+ return element;
+ },
+
+ /**
+ * Unbinds an event listener for an element
+ *
+ * @param element {HTMLElement} The host HTML element
+ * @param type {String} The type of the DOM event
+ * @param fn {Function} The event handler to unbind
+ */
+ remove: function (element, type, fn) {
+ jQuery(element).off(type, fn);
+ },
+
+ /**
+ * Adds a subscriber for the passed topic.
+ *
+ * @param topic {String} - the channel name for which this subscriber will be notified
+ * If '*' then it will be notified for all topics
+ * @param subscriber {Function} - the callback to call when an event with this type is published
+ */
+ subscribe: function (topic, subscriber) {
+ if (topic) {
+ jQuery(document).on(topic, subscriber);
+ }
+ },
+
+ /**
+ * Un-subscribes a subscriber from a topic.
+ * @param topic {String} - the topic name. If omitted un-subscribes all
+ * subscribers from all topics
+ * @param subscriber {Function} - the handler to un-subscribe. If omitted then
+ * all subscribers are removed from this topic
+ */
+ unsubscribe: function(topic, subscriber) {
+ if (topic) {
+ if (subscriber) {
+ jQuery(document).off(topic, subscriber);
+ } else {
+ jQuery(document).off(topic);
+ }
+ } else {
+ jQuery(document).off();
+ }
+ },
+
+ /**
+ * Sends a notification to all subscribers for the given topic.
+ * Subscribers for topic '*' receive the actual topic as first parameter,
+ * otherwise the topic is not passed to subscribers which listen for specific
+ * event types.
+ *
+ * @param topic {String} - the channel name for which all subscribers will be notified.
+ */
+ publish: function (topic) {
+ if (topic) {
+ // cut the topic argument
+ var args = Array.prototype.slice.call(arguments).slice(1);
+
+ jQuery(document).triggerHandler(topic, args);
+ jQuery(document).triggerHandler('*', args);
+ }
+ },
+
+ /**
+ * The names of the topics on which Wicket notifies
+ */
+ Topic: {
+ DOM_NODE_REMOVING : '/dom/node/removing',
+ DOM_NODE_ADDED : '/dom/node/added',
+ AJAX_CALL_INIT : '/ajax/call/init',
+ AJAX_CALL_BEFORE : '/ajax/call/before',
+ AJAX_CALL_PRECONDITION : '/ajax/call/precondition',
+ AJAX_CALL_BEFORE_SEND : '/ajax/call/beforeSend',
+ AJAX_CALL_SUCCESS : '/ajax/call/success',
+ AJAX_CALL_COMPLETE : '/ajax/call/complete',
+ AJAX_CALL_AFTER : '/ajax/call/after',
+ AJAX_CALL_FAILURE : '/ajax/call/failure',
+ AJAX_CALL_DONE : '/ajax/call/done',
+ AJAX_HANDLERS_BOUND : '/ajax/handlers/bound'
+ }
+ }
+ });
/**
* A special event that is used to listen for immediate changes in input fields.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
deleted file mode 100644
index 87f6b64..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Wicket Ajax Support
- *
- * @author Igor Vaynberg
- * @author Matej Knopp
- */
-
-;(function (jQuery, undefined) {
- 'use strict';
-
- if (typeof(Wicket) === 'undefined') {
- window.Wicket = {};
- }
-
- if (typeof(Wicket.Event) === 'object') {
- return;
- }
-
- jQuery.extend(true, Wicket, {
-
- Browser: {
- _isKHTML: null,
- isKHTML: function () {
- var wb = Wicket.Browser;
- if (wb._isKHTML === null) {
- wb._isKHTML = (/Konqueror|KHTML/).test(window.navigator.userAgent) && !/Apple/.test(window.navigator.userAgent);
- }
- return wb._isKHTML;
- },
-
- _isSafari: null,
- isSafari: function () {
- var wb = Wicket.Browser;
- if (wb._isSafari === null) {
- wb._isSafari = !/Chrome/.test(window.navigator.userAgent) && /KHTML/.test(window.navigator.userAgent) && /Apple/.test(window.navigator.userAgent);
- }
- return wb._isSafari;
- },
-
- _isChrome: null,
- isChrome: function () {
- var wb = Wicket.Browser;
- if (wb._isChrome === null) {
- wb._isChrome = (/KHTML/).test(window.navigator.userAgent) && /Apple/.test(window.navigator.userAgent) && /Chrome/.test(window.navigator.userAgent);
- }
- return wb._isChrome;
- },
-
- _isOpera: null,
- isOpera: function () {
- var wb = Wicket.Browser;
- if (wb._isOpera === null) {
- wb._isOpera = !Wicket.Browser.isSafari() && typeof(window.opera) !== "undefined";
- }
- return wb._isOpera;
- },
-
- _isIE: null,
- isIE: function () {
- var wb = Wicket.Browser;
- if (wb._isIE === null) {
- wb._isIE = !Wicket.Browser.isSafari() && (typeof(document.all) !== "undefined" || window.navigator.userAgent.indexOf("Trident/")>-1) && typeof(window.opera) === "undefined";
- }
- return wb._isIE;
- },
-
- _isIEQuirks: null,
- isIEQuirks: function () {
- var wb = Wicket.Browser;
- if (wb._isIEQuirks === null) {
- // is the browser internet explorer in quirks mode (we could use document.compatMode too)
- wb._isIEQuirks = Wicket.Browser.isIE() && window.document.documentElement.clientHeight === 0;
- }
- return wb._isIEQuirks;
- },
-
- _isIELessThan9: null,
- isIELessThan9: function () {
- var wb = Wicket.Browser;
- if (wb._isIELessThan9 === null) {
- var index = window.navigator.userAgent.indexOf("MSIE");
- var version = parseFloat(window.navigator.userAgent.substring(index + 5));
- wb._isIELessThan9 = Wicket.Browser.isIE() && version < 9;
- }
- return wb._isIELessThan9;
- },
-
- _isIELessThan11: null,
- isIELessThan11: function () {
- var wb = Wicket.Browser;
- if (wb._isIELessThan11 === null) {
- wb._isIELessThan11 = !Wicket.Browser.isSafari() && typeof(document.all) !== "undefined" && typeof(window.opera) === "undefined";
- }
- return wb._isIELessThan11;
- },
-
- _isIE11: null,
- isIE11: function () {
- var wb = Wicket.Browser;
- if (wb._isIE11 === null) {
- var userAgent = window.navigator.userAgent;
- var isTrident = userAgent.indexOf("Trident") > -1;
- var is11 = userAgent.indexOf("rv:11") > -1;
- wb._isIE11 = isTrident && is11;
- }
- return wb._isIE11;
- },
-
- _isGecko: null,
- isGecko: function () {
- var wb = Wicket.Browser;
- if (wb._isGecko === null) {
- wb._isGecko = (/Gecko/).test(window.navigator.userAgent) && !Wicket.Browser.isSafari();
- }
- return wb._isGecko;
- }
- },
-
- /**
- * Events related code
- * Based on code from Mootools (http://mootools.net)
- */
- Event: {
- idCounter: 0,
-
- getId: function (element) {
- var $el = jQuery(element),
- id = $el.prop("id");
-
- if (typeof(id) === "string" && id.length > 0) {
- return id;
- } else {
- id = "wicket-generated-id-" + Wicket.Event.idCounter++;
- $el.prop("id", id);
- return id;
- }
- },
-
- keyCode: function (evt) {
- return Wicket.Event.fix(evt).keyCode;
- },
-
- /**
- * Prevent event from bubbling up in the element hierarchy.
- * @param evt {Event} - the event to stop
- * @param immediate {Boolean} - true if the event should not be handled by other listeners registered
- * on the same HTML element. Optional
- */
- stop: function (evt, immediate) {
- evt = Wicket.Event.fix(evt);
- if (immediate) {
- evt.stopImmediatePropagation();
- } else {
- evt.stopPropagation();
- }
- return evt;
- },
-
- /**
- * If no event is given as argument (IE), window.event is returned.
- */
- fix: function (evt) {
- return jQuery.event.fix(evt || window.event);
- },
-
- fire: function (element, event) {
- event = (event === 'mousewheel' && Wicket.Browser.isGecko()) ? 'DOMMouseScroll' : event;
- jQuery(element).trigger(event);
- },
-
- /**
- * Binds an event listener for an element
- *
- * Also supports the special 'domready' event on window.
- * 'domready' is event fired when the DOM is complete, but
- * before loading external resources (images, scripts, ...)
- *
- * @param element {HTMLElement} The host HTML element
- * @param type {String} The type of the DOM event
- * @param fn {Function} The event handler to unbind
- * @param data {Object} Extra data for the event
- * @param selector {String} A selector string to filter the descendants of the selected
- * elements that trigger the event. If the selector is null or omitted,
- * the event is always triggered when it reaches the selected element.
- */
- add: function (element, type, fn, data, selector) {
- if (type === 'domready') {
- jQuery(fn);
- } else if (type === 'load' && element === window) {
- jQuery(window).on('load', function() {
- jQuery(fn);
- });
- } else {
- type = (type === 'mousewheel' && Wicket.Browser.isGecko()) ? 'DOMMouseScroll' : type;
- var el = element;
- if (typeof(element) === 'string') {
- el = document.getElementById(element);
- }
-
- if (!el && Wicket.Log) {
- Wicket.Log.error('Cannot bind a listener for event "' + type +
- '" on element "' + element + '" because the element is not in the DOM');
- }
-
- jQuery(el).on(type, selector, data, fn);
- }
- return element;
- },
-
- /**
- * Unbinds an event listener for an element
- *
- * @param element {HTMLElement} The host HTML element
- * @param type {String} The type of the DOM event
- * @param fn {Function} The event handler to unbind
- */
- remove: function (element, type, fn) {
- jQuery(element).off(type, fn);
- },
-
- /**
- * Adds a subscriber for the passed topic.
- *
- * @param topic {String} - the channel name for which this subscriber will be notified
- * If '*' then it will be notified for all topics
- * @param subscriber {Function} - the callback to call when an event with this type is published
- */
- subscribe: function (topic, subscriber) {
-
- if (topic) {
- jQuery(document).on(topic, subscriber);
- }
- },
-
- /**
- * Un-subscribes a subscriber from a topic.
- * @param topic {String} - the topic name. If omitted un-subscribes all
- * subscribers from all topics
- * @param subscriber {Function} - the handler to un-subscribe. If omitted then
- * all subscribers are removed from this topic
- */
- unsubscribe: function(topic, subscriber) {
- if (topic) {
- if (subscriber) {
- jQuery(document).off(topic, subscriber);
- } else {
- jQuery(document).off(topic);
- }
- } else {
- jQuery(document).off();
- }
- },
-
- /**
- * Sends a notification to all subscribers for the given topic.
- * Subscribers for topic '*' receive the actual topic as first parameter,
- * otherwise the topic is not passed to subscribers which listen for specific
- * event types.
- *
- * @param topic {String} - the channel name for which all subscribers will be notified.
- */
- publish: function (topic) {
- if (topic) {
- // cut the topic argument
- var args = Array.prototype.slice.call(arguments).slice(1);
-
- jQuery(document).triggerHandler(topic, args);
- jQuery(document).triggerHandler('*', args);
- }
- },
-
- /**
- * The names of the topics on which Wicket notifies
- */
- Topic: {
- DOM_NODE_REMOVING : '/dom/node/removing',
- DOM_NODE_ADDED : '/dom/node/added',
- AJAX_CALL_INIT : '/ajax/call/init',
- AJAX_CALL_BEFORE : '/ajax/call/before',
- AJAX_CALL_PRECONDITION : '/ajax/call/precondition',
- AJAX_CALL_BEFORE_SEND : '/ajax/call/beforeSend',
- AJAX_CALL_SUCCESS : '/ajax/call/success',
- AJAX_CALL_COMPLETE : '/ajax/call/complete',
- AJAX_CALL_AFTER : '/ajax/call/after',
- AJAX_CALL_FAILURE : '/ajax/call/failure',
- AJAX_CALL_DONE : '/ajax/call/done',
- AJAX_HANDLERS_BOUND : '/ajax/handlers/bound'
- }
- }
- });
-})(jQuery);
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
index 45ec472..cc51588 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
@@ -21,26 +21,28 @@ import java.util.List;
import java.util.Objects;
import org.apache.wicket.Application;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.settings.JavaScriptLibrarySettings;
-import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
/**
* {@link HeaderItem} for scripts that need to be executed directly after the DOM has been built,
* but before external resources, such as images, are loaded.
- *
+ *
* @author papegaaij
*/
public class OnDomReadyHeaderItem extends HeaderItem
{
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a {@link OnDomReadyHeaderItem} for the script.
- *
+ *
* @param javaScript
* The script to execute on the DOM ready event.
- *
+ *
* @return A newly created {@link OnDomReadyHeaderItem}.
*/
public static OnDomReadyHeaderItem forScript(CharSequence javaScript)
@@ -62,7 +64,7 @@ public class OnDomReadyHeaderItem extends HeaderItem
/**
* Construct.
- *
+ *
* @param javaScript
*/
public OnDomReadyHeaderItem(CharSequence javaScript)
@@ -120,9 +122,9 @@ public class OnDomReadyHeaderItem extends HeaderItem
public List<HeaderItem> getDependencies()
{
JavaScriptLibrarySettings ajaxSettings = Application.get().getJavaScriptLibrarySettings();
- ResourceReference wicketEventReference = ajaxSettings.getWicketEventReference();
+ ResourceReference wicketAjaxReference = ajaxSettings.getWicketAjaxReference();
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+ dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
return dependencies;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
index b69e7a4..0e5f741 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
@@ -31,21 +31,23 @@ import org.apache.wicket.util.string.Strings;
/**
* {@link HeaderItem} for event triggered scripts.
- *
+ *
* @author papegaaij
*/
public class OnEventHeaderItem extends HeaderItem
{
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a {@link OnEventHeaderItem} for the given parameters.
- *
+ *
* @param target
* The target of the event handler, for example 'window' or 'document'.
* @param event
* The event itself, for example 'click'.
* @param javaScript
* The script to execute on the event.
- *
+ *
* @return A newly created {@link OnEventHeaderItem}.
*/
public static OnEventHeaderItem forScript(String target, String event, CharSequence javaScript)
@@ -72,7 +74,7 @@ public class OnEventHeaderItem extends HeaderItem
/**
* Construct.
- *
+ *
* @param target
* @param event
* @param javaScript
@@ -180,9 +182,9 @@ public class OnEventHeaderItem extends HeaderItem
public List<HeaderItem> getDependencies()
{
JavaScriptLibrarySettings ajaxSettings = Application.get().getJavaScriptLibrarySettings();
- ResourceReference wicketEventReference = ajaxSettings.getWicketEventReference();
+ ResourceReference wicketAjaxReference = ajaxSettings.getWicketAjaxReference();
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+ dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
return dependencies;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
index 51e34bf..3cd2cde 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
@@ -29,17 +29,19 @@ import org.apache.wicket.util.string.Strings;
/**
* {@link HeaderItem} for scripts that need to be executed after the entire page is loaded.
- *
+ *
* @author papegaaij
*/
public class OnLoadHeaderItem extends HeaderItem
{
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a {@link OnLoadHeaderItem} for the script.
- *
+ *
* @param javaScript
* The script to execute on the load event.
- *
+ *
* @return A newly created {@link OnLoadHeaderItem}.
*/
public static OnLoadHeaderItem forScript(CharSequence javaScript)
@@ -61,7 +63,7 @@ public class OnLoadHeaderItem extends HeaderItem
/**
* Construct.
- *
+ *
* @param javaScript
*/
public OnLoadHeaderItem(CharSequence javaScript)
@@ -120,9 +122,9 @@ public class OnLoadHeaderItem extends HeaderItem
public List<HeaderItem> getDependencies()
{
JavaScriptLibrarySettings ajaxSettings = Application.get().getJavaScriptLibrarySettings();
- ResourceReference wicketEventReference = ajaxSettings.getWicketEventReference();
+ ResourceReference wicketAjaxReference = ajaxSettings.getWicketAjaxReference();
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+ dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
return dependencies;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
index 84d16fa..049d49e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.form;
import java.util.List;
import org.apache.wicket.Application;
-import org.apache.wicket.ajax.WicketEventJQueryResourceReference;
+import org.apache.wicket.ajax.WicketAjaxJQueryResourceReference;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -33,11 +33,11 @@ import org.apache.wicket.request.resource.ResourceReference;
* Base class for all Javascript-based "select-all" checkboxes. Provides a simple "select all"
* checkbox which can be automatically updated based on the selection state of the checkboxes it
* controls (see {@link #wantAutomaticUpdate()}).
- *
+ *
* @see CheckboxMultipleChoiceSelector
* @see CheckGroupSelector
* @see CheckBoxSelector
- *
+ *
* @author Carl-Eric Menzel <cm...@wicketbuch.de>
*/
public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
@@ -58,9 +58,9 @@ public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
public List<HeaderItem> getDependencies()
{
List<HeaderItem> dependencies = super.getDependencies();
- ResourceReference wicketEventReference = WicketEventJQueryResourceReference.get();
+ ResourceReference wicketEventReference = WicketAjaxJQueryResourceReference.get();
if (Application.exists()) {
- wicketEventReference = Application.get().getJavaScriptLibrarySettings().getWicketEventReference();
+ wicketEventReference = Application.get().getJavaScriptLibrarySettings().getWicketAjaxReference();
}
dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
return dependencies;
@@ -69,7 +69,7 @@ public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
/**
* Construct.
- *
+ *
* @param id
* the component id
*/
@@ -126,7 +126,7 @@ public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
/**
* Concrete subclasses must override this to provide a Javascript function that returns the IDs
* of all checkboxes that should be controlled by this selector.
- *
+ *
* @return a String containing a Javascript expression that evaluates to a function(!). This
* function must return an array containing the IDs of all checkbox input elements that
* this selector should control.
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/resource/CoreLibrariesContributor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CoreLibrariesContributor.java b/wicket-core/src/main/java/org/apache/wicket/resource/CoreLibrariesContributor.java
index be32b02..49da713 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/CoreLibrariesContributor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/CoreLibrariesContributor.java
@@ -26,14 +26,14 @@ import org.apache.wicket.settings.JavaScriptLibrarySettings;
/**
* A helper class that contributes all required JavaScript resources needed for Wicket Ajax
* functionality
- *
+ *
* @since 6.0
*/
public class CoreLibrariesContributor
{
/**
* Contributes the backing library plus the implementation of Wicket.Event.
- *
+ *
* @param application
* the application instance
* @param response
@@ -42,14 +42,14 @@ public class CoreLibrariesContributor
public static void contribute(final Application application, final IHeaderResponse response)
{
JavaScriptLibrarySettings jsLibrarySettings = application.getJavaScriptLibrarySettings();
- ResourceReference wicketEventReference = jsLibrarySettings.getWicketEventReference();
- response.render(JavaScriptHeaderItem.forReference(wicketEventReference));
+ ResourceReference wicketAjaxReference = jsLibrarySettings.getWicketAjaxReference();
+ response.render(JavaScriptHeaderItem.forReference(wicketAjaxReference));
}
/**
* Contributes the Ajax backing library plus wicket-event.js and wicket-ajax.js implementations.
* Additionally if Ajax debug is enabled then wicket-ajax-debug.js implementation is also added.
- *
+ *
* @param application
* the application instance
* @param response
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
index 7520211..0c7f54a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/JavaScriptLibrarySettings.java
@@ -18,9 +18,7 @@ package org.apache.wicket.settings;
import org.apache.wicket.ajax.WicketAjaxDebugJQueryResourceReference;
import org.apache.wicket.ajax.WicketAjaxJQueryResourceReference;
-import org.apache.wicket.ajax.WicketEventJQueryResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.resource.DynamicJQueryResourceReference;
import org.apache.wicket.resource.JQueryResourceReference;
import org.apache.wicket.util.lang.Args;
@@ -38,9 +36,7 @@ import org.apache.wicket.util.lang.Args;
*/
public class JavaScriptLibrarySettings
{
- private ResourceReference jQueryReference = DynamicJQueryResourceReference.getV2();
-
- private ResourceReference wicketEventReference = WicketEventJQueryResourceReference.get();
+ private ResourceReference jQueryReference = JQueryResourceReference.getV2();
private ResourceReference wicketAjaxReference = WicketAjaxJQueryResourceReference.get();
@@ -68,25 +64,6 @@ public class JavaScriptLibrarySettings
}
/**
- * @return the reference to the implementation of wicket-event.js
- */
- public ResourceReference getWicketEventReference()
- {
- return wicketEventReference;
- }
-
- /**
- * @param wicketEventReference
- * a reference to the implementation of wicket-event.js
- * @return {@code this} object for chaining
- */
- public JavaScriptLibrarySettings setWicketEventReference(ResourceReference wicketEventReference)
- {
- this.wicketEventReference = Args.notNull(wicketEventReference, "wicketEventReference");
- return this;
- }
-
- /**
* @return the reference to the implementation of wicket-ajax.js
*/
public ResourceReference getWicketAjaxReference()
@@ -126,5 +103,4 @@ public class JavaScriptLibrarySettings
"wicketAjaxDebugReference");
return this;
}
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
index 430b437..154a589 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1">body</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
index b5c0e8e..0bf6d01 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
@@ -1,6 +1,5 @@
<html xmlns:wicket>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
index 9657b04..4c956f7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
@@ -1,7 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
index e02474a..0f67740 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
@@ -14,7 +14,7 @@ test
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<link href="../../test2"/>
<script type="text/javascript" src="../../javascripturlB"></script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
index 576e3c8..24c6f7f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
@@ -3,11 +3,10 @@
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<link href="../../test2"/>
<script type="text/javascript" src="../../javascripturlB"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
index b3a6f4a..e30e35d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
@@ -8,5 +8,5 @@ test
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
</head>]]></header-contribution><priority-evaluate><![CDATA[(function(){prepend();})();]]></priority-evaluate><evaluate><![CDATA[(function(){domReady();})();(function(){append();})();(function(){onLoad();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
index 76d4d58..bb905f6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
@@ -3,7 +3,6 @@
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index 5b01c8a..b062812 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
index 2547bd2..0f771cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
index 4267c0b..71ef678 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
index 6e16924..745a77a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
index 08fffa3..67d2337 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
index 8185fe4..072c3f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
index fdcaff2..0bed6b9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
index 8c100a4..9a8f5f0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
index b105f37..0eae403 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
@@ -1,6 +1,5 @@
<html>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
index 844bb7a..1ad6c34 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
@@ -3,7 +3,6 @@
<html wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" lang="de" id="html1">
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index 6cbb77a..a9f9aa7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -1,6 +1,5 @@
<html xmlns:wicket>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
index bc85d59..c21fe6e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
@@ -1,6 +1,5 @@
<html xmlns:wicket>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
index bfccc12..dd342eb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
@@ -1,6 +1,5 @@
<html xmlns:wicket>
<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
index 729f079..6a53359 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
index 50e37dd..3a70f51 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-2.2.4.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.resource.aggregator.ResourceAggregatorTest2Page/ResourceAggregatorTest2Page.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/js/all.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/all.html b/wicket-core/src/test/js/all.html
index dac5ada..081c370 100644
--- a/wicket-core/src/test/js/all.html
+++ b/wicket-core/src/test/js/all.html
@@ -9,7 +9,6 @@
document.write("<scr"+"ipt src='../../main/java/org/apache/wicket/resource/jquery/jquery-"+location.search.substring(1)+".js'></scr"+"ipt>");
</script>
<!--<script src="https://code.jquery.com/jquery-migrate-3.0.0.js"></script>-->
- <script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js"></script>
<script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js"></script>
<script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" src="qunit/qunit.js"></script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/js/amd.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/amd.html b/wicket-core/src/test/js/amd.html
index 3a27f94..c4e5c27 100644
--- a/wicket-core/src/test/js/amd.html
+++ b/wicket-core/src/test/js/amd.html
@@ -9,7 +9,6 @@
var require = {
paths: {
'jquery': '../../main/java/org/apache/wicket/resource/jquery/jquery-'+location.search.substring(1), // no .js extension
- 'wicket-event': '../../main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery',
'Wicket': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery',
'WicketDebugWindow': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug',
"qunit": "qunit/qunit"
@@ -19,7 +18,7 @@
deps: ['jquery']
},
'Wicket': {
- deps: ['wicket-event'],
+ deps: ['wicket-ajax'],
exports: 'Wicket'
},
'WicketDebugWindow': {
http://git-wip-us.apache.org/repos/asf/wicket/blob/0f767eb5/wicket-core/src/test/js/amd.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/amd.js b/wicket-core/src/test/js/amd.js
index 0dbb9ae..d2617d2 100644
--- a/wicket-core/src/test/js/amd.js
+++ b/wicket-core/src/test/js/amd.js
@@ -35,8 +35,8 @@ define(
qunit.expect(15);
// test for one member for each Wicket.** module
- qunit.ok($.isFunction(w.Browser.isChrome), "Wicket Browser (from wicket-event-jquery.js) is imported");
- qunit.ok($.isFunction(w.Event.fix), "Wicket Event (from wicket-event-jquery.js) is imported");
+ qunit.ok($.isFunction(w.Browser.isChrome), "Wicket Browser (from wicket-ajax-jquery.js) is imported");
+ qunit.ok($.isFunction(w.Event.fix), "Wicket Event (from wicket-ajax-jquery.js) is imported");
qunit.ok($.isFunction(w.Ajax.ajax), "Wicket Ajax (from wicket-ajax-jquery.js) is imported");
qunit.ok($.isFunction(w.DOM.get), "Wicket DOM (from wicket-ajax-jquery.js) is imported");
qunit.ok($.isFunction(w.Form.serialize), "Wicket Form (from wicket-ajax-jquery.js) is imported");
[2/2] wicket git commit: Merge remote-tracking branch 'origin/master'
into WICKET-6497-unify-js
Posted by so...@apache.org.
Merge remote-tracking branch 'origin/master' into WICKET-6497-unify-js
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ba74ad84
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ba74ad84
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ba74ad84
Branch: refs/heads/master
Commit: ba74ad84911b3a6af65bd8169b9bcd9b757ba6e3
Parents: 0f767eb 0769a60
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Nov 24 16:50:36 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Nov 24 16:50:36 2017 +0700
----------------------------------------------------------------------
.../apache/wicket/ajax/AjaxEventBehavior.java | 24 --------------------
.../wicket/markup/head/OnEventHeaderItem.java | 10 --------
.../wicket/util/tester/WicketTesterHelper.java | 10 --------
wicket-examples/pom.xml | 23 ++-----------------
.../proxy/objenesis/ObjenesisProxyFactory.java | 1 -
wicket-user-guide/src/main/asciidoc/single.adoc | 2 +-
6 files changed, 3 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ba74ad84/wicket-core/src/main/java/org/apache/wicket/markup/head/OnEventHeaderItem.java
----------------------------------------------------------------------