Author: knopp Date: Fri Aug 3 10:28:32 2007 New Revision: 562526 URL: http://svn.apache.org/viewvc?view=rev&rev=562526 Log: window.name value should be prefixed by wicket independenly of pagemap name
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?view=diff&rev=562526&r1=562525&r2=562526 ============================================================================== --- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original) +++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Fri Aug 3 10:28:32 2007 @@ -130,18 +130,16 @@ JavascriptUtils.writeOpenTag(response); response .write("if (window.name=='' || window.name.indexOf('wicket') > -1) { window.name=\""); - response.write(name); + response.write("wicket-" + name); response.write("\"; }"); JavascriptUtils.writeCloseTag(response); } else { // Here is our trickery to detect whether the current request - // was - // made in a new window/ tab, in which case it should go in a - // different page map so that we don't intermangle the history - // of - // those windows + // was made in a new window/ tab, in which case it should go in + // a different page map so that we don't intermangle the history + // of those windows CharSequence url = null; if (target instanceof IBookmarkablePageRequestTarget) { @@ -158,7 +156,7 @@ JavascriptUtils.writeOpenTag(response); response .write("if (window.name=='' || (window.name.indexOf('wicket') > -1 && window.name!='" + - name + "')) { window.location=\""); + "wicket-" + name + "')) { window.location=\""); response.write(url); response.write("\"; }"); JavascriptUtils.writeCloseTag(response);