You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/02 17:33:13 UTC
[1/2] wicket git commit: WICKET-6105 Decommission wicket-datetime
Repository: wicket
Updated Branches:
refs/heads/master ffa34c6bf -> 7b31893a0
WICKET-6105 Decommission wicket-datetime
Remove Maven site files
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6083c815
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6083c815
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6083c815
Branch: refs/heads/master
Commit: 6083c8157845681df8a430e33598a545b0da7c35
Parents: ffa34c6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 26 22:26:04 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 26 22:26:04 2016 +0100
----------------------------------------------------------------------
wicket-datetime/src/site/apt/index.apt | 24 ------------------
wicket-datetime/src/site/site.xml | 38 -----------------------------
2 files changed, 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6083c815/wicket-datetime/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/site/apt/index.apt b/wicket-datetime/src/site/apt/index.apt
deleted file mode 100644
index dba4558..0000000
--- a/wicket-datetime/src/site/apt/index.apt
+++ /dev/null
@@ -1,24 +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.
-
-Apache Wicket Date/Time
-
- Date/Time components and utilities for Wicket
-
-* License
-
- Wicket is distributed under the terms of the Apache Software Foundation license,
- version 2.0. The text is included in the file LICENSE.txt in the root of the
- project.
http://git-wip-us.apache.org/repos/asf/wicket/blob/6083c815/wicket-datetime/src/site/site.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/site/site.xml b/wicket-datetime/src/site/site.xml
deleted file mode 100644
index 79c4f50..0000000
--- a/wicket-datetime/src/site/site.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
-<project name="Wicket Date/Time">
- <skin>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-site-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </skin>
- <body>
- <menu name="Wicket Date/Time">
- <item name="About" href="/index.html" />
- <item name="Apache Wicket" href="http://wicket.apache.org" />
- <item name="License" href="/license.html" />
- </menu>
- <menu name="Project Info">
- <item name="Dependencies" href="/dependencies.html"/>
- <item name="Javadoc" href="/apidocs/index.html" target="_blank" class="newwindow" />
- <item name="Mailing Lists" href="/mail-lists.html" />
- <item name="Issue Tracker" href="http://issues.apache.org/jira/browse/WICKET" />
- <item name="SVN Access" href="/source-repository.html" />
- </menu>
- </body>
-</project>
[2/2] wicket git commit: WICKET-6108 Closing a ModalWindow with
jQuery 2.2.0 produces javascript errors
Posted by mg...@apache.org.
WICKET-6108 Closing a ModalWindow with jQuery 2.2.0 produces javascript errors
Wicket should not try to stop 'domready' events.
In case of 'domready' Wicket uses jQuery.ready(handler) instead of jQuery.on(eventName, handler) and this makes the difference.
See https://github.com/jquery/jquery/issues/2963
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7b31893a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7b31893a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7b31893a
Branch: refs/heads/master
Commit: 7b31893a030ade58ce10519a0ac0296ca8207058
Parents: 6083c81
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 2 17:30:09 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 2 17:33:04 2016 +0100
----------------------------------------------------------------------
.../apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 13 +++++++++----
.../apache/wicket/ajax/res/js/wicket-event-jquery.js | 3 +--
wicket-core/src/test/js/ajax.js | 6 ++++--
3 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b31893a/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 aff5556..55e6e61 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
@@ -1955,9 +1955,12 @@
Wicket.Event.add(attrs.c, evt, function (jqEvent, data) {
var call = new Wicket.Ajax.Call();
var attributes = jQuery.extend({}, attrs);
- attributes.event = Wicket.Event.fix(jqEvent);
- if (data) {
- attributes.event.extraData = data;
+
+ if (evt !== "domready") {
+ attributes.event = Wicket.Event.fix(jqEvent);
+ if (data) {
+ attributes.event.extraData = data;
+ }
}
call._executeHandlers(attributes.ih, attributes);
@@ -1975,7 +1978,9 @@
else {
call.ajax(attributes);
}
- Wicket.Ajax._handleEventCancelation(attributes);
+ if (evt !== "domready") {
+ Wicket.Ajax._handleEventCancelation(attributes);
+ }
}, null, attrs.sel);
});
},
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b31893a/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
index 7e0322c..9fb0aa2 100644
--- 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
@@ -177,8 +177,7 @@
* If no event is given as argument (IE), window.event is returned.
*/
fix: function (evt) {
- var evnt = evt || window.event;
- return jQuery.event.fix(evnt);
+ return evt || jQuery.event.fix(window.event);
},
fire: function (element, event) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/7b31893a/wicket-core/src/test/js/ajax.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/ajax.js b/wicket-core/src/test/js/ajax.js
index c66ef6d..bdd772f 100644
--- a/wicket-core/src/test/js/ajax.js
+++ b/wicket-core/src/test/js/ajax.js
@@ -435,7 +435,7 @@ jQuery(document).ready(function() {
*/
asyncTest('verify default attributes.', function () {
- expect(25);
+ expect(26);
var attrs = {
u: 'data/ajax/nonWicketResponse.json',
@@ -445,6 +445,7 @@ jQuery(document).ready(function() {
equal(textStatus, "parsererror", "textStatus");
equal(attributes.u, attrs.u, "url");
deepEqual(attributes.e, [ "domready" ], "events");
+ equal(attributes.event, null, "No event for 'domready'");
equal(attributes.ch, '0|s', 'channel');
equal(attributes.dt, 'xml', 'data type');
equal(attributes.wr, true, 'wicket ajax response');
@@ -476,7 +477,7 @@ jQuery(document).ready(function() {
asyncTest('verify arguments to global listeners. Success scenario.', function () {
- expect(13);
+ expect(14);
var attrs = {
u: 'data/ajax/nonWicketResponse.json',
@@ -496,6 +497,7 @@ jQuery(document).ready(function() {
two: '2',
three: true
};
+ ok(attributes.event instanceof jQuery.Event, "There must be an event for non-'domready' events");
deepEqual(data, expected, 'Success: data');
equal('success', textStatus, 'Success: textStatus');
equal(attrs.u, attributes.u, 'Success: attrs');