You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/11/12 03:55:13 UTC
svn commit: r473855 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/dojo/AjaxShellDelegate.java
test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
Author: jkuhnert
Date: Sat Nov 11 18:55:12 2006
New Revision: 473855
URL: http://svn.apache.org/viewvc?view=rev&rev=473855
Log:
Fixes absolute url bug in AjaxShellDelegate with https (in some instances).
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java?view=diff&rev=473855&r1=473854&r2=473855
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java Sat Nov 11 18:55:12 2006
@@ -88,7 +88,7 @@
// The key to resolving everything out of the asset service
dojoConfig.put("baseRelativePath",
- _assetService.getLink(true, _dojoPath.getResourceLocation().getPath()).getAbsoluteURL());
+ _assetService.getLink(true, _dojoPath.getResourceLocation().getPath()).getURL());
dojoConfig.put("preventBackButtonFix", _preventBackButtonFix);
dojoConfig.put("parseWidgets", _parseWidgets);
@@ -116,14 +116,14 @@
str.append("<script type=\"text/javascript\" src=\"")
.append(_assetService.getLink(true,
_dojoSource.getResourceLocation()
- .getPath()).getAbsoluteURL()).append("\"></script>");
+ .getPath()).getURL()).append("\"></script>");
// include core tapestry.js package
str.append("<script type=\"text/javascript\" src=\"")
.append(_assetService.getLink(true,
_tapestrySource.getResourceLocation()
- .getPath()).getAbsoluteURL()).append("\"></script>");
+ .getPath()).getURL()).append("\"></script>");
String logRequire = _consoleEnabled ? "dojo.require(\"dojo.debug.console\");\n"
: "dojo.require(\"dojo.logging.Logger\");\n";
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java?view=diff&rev=473855&r1=473854&r2=473855
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java Sat Nov 11 18:55:12 2006
@@ -48,7 +48,7 @@
ILink link = newLink();
expect(engine.getLink(Boolean.TRUE, path)).andReturn(link);
- expect(link.getAbsoluteURL()).andReturn("http://" + path);
+ expect(link.getURL()).andReturn("http://" + path);
}
void trainPageLocale(IRequestCycle cycle, Locale locale)