svn commit: r497204 - /incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

[knopp]

Author: knopp
Date: Wed Jan 17 14:08:58 2007
New Revision: 497204

URL: http://svn.apache.org/viewvc?view=rev&rev=497204
Log:
Modal window fixes

Modified:
    
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

Modified: 
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?view=diff&rev=497204&r1=497203&r2=497204
==============================================================================
--- 
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
 (original)
+++ 
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
 Wed Jan 17 14:08:58 2007
@@ -139,9 +139,10 @@
        public ModalWindow(MarkupContainer parent, String id)
        {
                super(parent, id);
+               setVersioned(false);
                empty = new WebMarkupContainer(this, getContentId());
 
-               this.cookieName = "modal-window-" + getClassRelativePath();
+               this.cookieName = null;
 
                add(new CloseButtonBehavior());
                add(new WindowClosedBehavior());
@@ -299,10 +300,20 @@
         */
        private static String getCloseJavacript()
        {
-               return "var win;\n" + "try {\n" + "     win = 
window.parent.Wicket.Window;\n"
-                               + "} catch (ignore) {\n" + "}\n"
+               return "var win;\n" //
+                               + "try {\n"
+                               + "     win = window.parent.Wicket.Window;\n"
+                               + "} catch (ignore) {\n"
+                               + "}\n"
+                               + "if (typeof(win) == \"undefined\" || 
typeof(win.current) == \"undefined\") {\n"
+                               + "  try {\n"
+                               + "     win = window.Wicket.Window;\n"
+                               + "  } catch (ignore) {\n"
+                               + "  }\n"
+                               + "}\n"
                                + "if (typeof(win) != \"undefined\" && 
typeof(win.current) != \"undefined\") {\n"
-                               + "     window.parent.setTimeout(function() 
{\n" + "            win.current.close();\n"
+                               + "     window.parent.setTimeout(function() {\n"
+                               + "             win.current.close();\n"
                                + "     }, 0);\n" + "}";
        }