Author: jcompagner
Date: Tue Jan 22 07:41:35 2008
New Revision: 614219
URL: http://svn.apache.org/viewvc?rev=614219&view=rev
Log:
try to do location.replace instead of src = xxx so that the history is replaced
for IE (back button doesn't first go to the index page of the website)
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=614219&r1=614218&r2=614219&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
(original)
+++
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Tue Jan 22 07:41:35 2008
@@ -602,7 +602,15 @@
if (this.settings.title == null)
this.update =
window.setInterval(this.updateTitle.bind(this), 100);
- this.content.src = this.settings.src;
+ try
+ {
+
this.content.contentWindow.location.replace(this.settings.src);
+ }
+ catch(ignore)
+ {
+ this.content.src = this.settings.src;
+ }
+
// opera seems to have problem accessing contentWindow here
if (Wicket.Browser.isOpera() || Wicket.Browser.isSafari()) {
