On Fri, Mar 11, 2011 at 10:50 AM, <[email protected]> wrote: > Updated patch > > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js > File > dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js > (right): > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js#newcode358 > dev/core/src/com/google/gwt/core/ext/linker/impl/HostedModeTemplate.js:358: > var url = computeUrlForResource("__MODULE_NAME__.nocache.js"); > On 2011/03/11 17:45:36, unnurg wrote: >> >> I don't think you want to touch this file - I don't recognize it, so I > > think >> >> it's for one of the old linkers, which won't have > > computeUrlForResource defined >> >> (note how it uses the 'base' variable, which is part of the legacy > > linkers). > > Reverted. > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js > File > dev/core/src/com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js > (right): > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js#newcode13 > dev/core/src/com/google/gwt/core/ext/linker/impl/loadExternalStylesheets.js:13: > l.setAttribute('href', computeUrlForResource(stylesheetUrl)); > On 2011/03/11 17:45:36, unnurg wrote: >> >> I think you should leave this file as is, and instead change >> ResourceInjectionUtil - line 85. Otherwise we calculate the URL in 2 > > places. > > I'm thinking of how to do this and not coming up with anything better. > > I can't change it to a compile time constant in > ResourceInjectionUtil.java to solve the problem for gadgets because its > a runtime transformation $wnd.gadgets.io.getProxyUrl(...); > > I can't add computeUrlForResource() as a parameter when making the > method call because that logic is shared between this and other linkers > (computeUrlForResource() won't be defined)
Discussed offline - it's poorly documented and not obvious, but injectResounces (which is used by all the older linkers) calls generateScriptInjector and generateStylesheetInjector injectStylesheets (which is used by the xsiframe linker) calls generateNewStylesheetInjector they're separate code paths, they're just in the same file for convenience (since the old code paths should be deleted soon) and because they both call isRelativeUrl so modifying injectNewStylesheetInjector should be fine > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/permutations.js > File dev/core/src/com/google/gwt/core/ext/linker/impl/permutations.js > (right): > > http://gwt-code-reviews.appspot.com/1385801/diff/1/dev/core/src/com/google/gwt/core/ext/linker/impl/permutations.js#newcode45 > dev/core/src/com/google/gwt/core/ext/linker/impl/permutations.js:45: > return "__HOSTED_FILENAME__"; > On 2011/03/11 17:45:36, unnurg wrote: >> >> On 2011/03/11 16:53:17, zundel wrote: >> > these 2 changes make me a bit queasy. They change the API for >> > getCompiledCodeFilename().. but if I don't leave these resources > > un-based, >> >> then >> > we lose flexibility in the computeUrlForResource() method. > > >> I'm confused - why don't you just return >> computeUrlForResource("__HOSTED_FILENAME__") here? > > Ummm... yeah, good idea. > > http://gwt-code-reviews.appspot.com/1385801/ > -- DO NOT FORWARD -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
