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 <[email protected]> Authored: Tue Apr 9 00:13:56 2013 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> 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) {
