Author: knopp
Date: Thu Sep 18 16:26:12 2008
New Revision: 696850
URL: http://svn.apache.org/viewvc?rev=696850&view=rev
Log:
WICKET-1120
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=696850&r1=696849&r2=696850&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Thu Sep 18 16:26:12 2008
@@ -359,7 +359,8 @@
+ " }\n"
+ "}\n"
+ "if (typeof(win) != \"undefined\" &&
typeof(win.current) != \"undefined\") {\n"
- + " window.parent.setTimeout(function()
{\n" + " win.current.close();\n" + " }, 0);\n" + "}";
+ + " var close = function(w) {
w.setTimeout(function() {\n" + " win.current.close();\n" + " },
0); } \n"
+ + " try { close(window.parent); } catch
(ignore) { close(window); };\n" + "}";
}
/**
