Updated Branches: refs/heads/master f5f802c56 -> c3ede367d
WICKET-4695 Javascript error when closing a ModalWindow with IE 8 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c3ede367 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c3ede367 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c3ede367 Branch: refs/heads/master Commit: c3ede367de6d59bac17d39e93764c38cee63bff8 Parents: f5f802c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 6 12:46:29 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 6 12:46:29 2012 +0300 ---------------------------------------------------------------------- .../ajax/markup/html/modal/ModalWindow.java | 2 +- .../extensions/ajax/markup/html/modal/res/modal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c3ede367/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java index bdfd356..5cdc1ee 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java @@ -418,7 +418,7 @@ public class ModalWindow extends Panel + " } catch (ignore) {\n" + " }\n" + "}\n" - + "if (typeof(win) != \"undefined\" && typeof(win.current) != \"undefined\") {\n" + + "if (win && win.current) {\n" + " var close = function(w) { w.setTimeout(function() {\n" + " win.current.close();\n" + " }, 0); } \n" http://git-wip-us.apache.org/repos/asf/wicket/blob/c3ede367/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js index 60bfc5a..4f55f63 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js @@ -257,7 +257,7 @@ win = window.parent.Wicket.Window; } catch (ignore) {} - if (typeof(win) !== "undefined" && typeof(win.current) !== "undefined") { + if (win && win.current) { // we can't call close directly, because it will delete our window, // so we will schedule it as timeout for parent's window window.parent.setTimeout(function() {
