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 2013/04/08 23:15:01 UTC
[1/3] git commit: WICKET-5125 IE8 error in wicket-date.js when used
in a modalwindow
Updated Branches:
refs/heads/master e8dab4a01 -> 640cd630c
WICKET-5125 IE8 error in wicket-date.js when used in a modalwindow
Add a check for existance of YAHOO.wicket[cfg.dpJs]
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/640cd630
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/640cd630
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/640cd630
Branch: refs/heads/master
Commit: 640cd630c52e0d5780518779078ecdf92781ee70
Parents: ac44eba
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 9 00:13:56 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 9 00:14:51 2013 +0300
----------------------------------------------------------------------
.../wicket/extensions/yui/calendar/wicket-date.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/640cd630/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
index 4963898..e82c723 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
@@ -304,7 +304,13 @@
var showBtn = document.getElementById(cfg.icon);
var fieldEl = document.getElementById(cfg.componentId);
- if (el !== dialogEl && el !== fieldEl && !YAHOO.util.Dom.isAncestor(dialogEl, el) && el !== showBtn && !YAHOO.util.Dom.isAncestor(showBtn, el)) {
+ if (YAHOO.wicket[cfg.dpJs] &&
+ el !== dialogEl &&
+ el !== fieldEl &&
+ !YAHOO.util.Dom.isAncestor(dialogEl, el) &&
+ el !== showBtn &&
+ !YAHOO.util.Dom.isAncestor(showBtn, el))
+ {
YAHOO.wicket[cfg.dpJs].hide();
}
});
@@ -414,7 +420,7 @@
});
};
- YAHOO.register("wicket-date", Wicket.DateTime, {version: "6.5.0", build: "1"});
+ YAHOO.register("wicket-date", Wicket.DateTime, {version: "6.7.0", build: "1"});
// register a listener to clean up YAHOO.wicket cache.
Wicket.Event.subscribe('/ajax/call/complete', function(jqEvent, attributes, jqXHR, errorThrown, textStatus) {
[2/3] git commit: Fix a minor typo in comment
Posted by mg...@apache.org.
Fix a minor typo in comment
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ac44eba9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ac44eba9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ac44eba9
Branch: refs/heads/master
Commit: ac44eba9da094f3455ecf522eb975614b701fa89
Parents: 1ccb57d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 9 00:08:00 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 9 00:14:51 2013 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ac44eba9/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 07cebf8..99b8ff9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2695,7 +2695,7 @@ public abstract class Component
response.markRendered(this);
}
- // Than ask all behaviors
+ // Then ask all behaviors
for (Behavior behavior : getBehaviors())
{
if (isBehaviorAccepted(behavior))
[3/3] git commit: WICKET-5104 AjaxSelfUpdatingTimerBehavior in hidden
component in ModalWindow causes Ajax Response Error
Posted by mg...@apache.org.
WICKET-5104 AjaxSelfUpdatingTimerBehavior in hidden component in ModalWindow causes Ajax Response Error
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ccb57d7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ccb57d7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ccb57d7
Branch: refs/heads/master
Commit: 1ccb57d741e1467b2ba296e4c6d135a558c1565b
Parents: e8dab4a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 9 00:07:28 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 9 00:14:51 2013 +0300
----------------------------------------------------------------------
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ccb57d7/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 7b5065e..f4acfc8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -190,9 +190,12 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
*/
public final void stop(final AjaxRequestTarget target)
{
- stopped = true;
- String timeoutHandle = getTimeoutHandle();
- target.prependJavaScript("clearTimeout("+timeoutHandle+"); delete "+timeoutHandle+";");
+ if (headRendered && stopped == false)
+ {
+ stopped = true;
+ String timeoutHandle = getTimeoutHandle();
+ target.prependJavaScript("clearTimeout("+timeoutHandle+"); delete "+timeoutHandle+";");
+ }
}
@Override