Author: j...@google.com
Date: Mon Jun 8 14:52:47 2009
New Revision: 5524
Modified:
branches/snapshot-2009.06.02-r5498/branch-info.txt
branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameTemplate.js
Log:
Merge trunk r5523 into the 6/2 snapshot branch.
svn merge -c5523 https://google-web-toolkit.googlecode.com/svn/trunk .
r5523 | j...@google.com | 2009-06-08 17:25:39 -0400 (Mon, 08 Jun 2009) | 5
lines
Fixes issues 3717 and 3733 by adding some extra latching to avoid creating
the
script frame until the body's done loading.
Patch by: mark.renouf, jgw
Review by: jgw, scottb (desk check)
Modified: branches/snapshot-2009.06.02-r5498/branch-info.txt
==============================================================================
--- branches/snapshot-2009.06.02-r5498/branch-info.txt (original)
+++ branches/snapshot-2009.06.02-r5498/branch-info.txt Mon Jun 8 14:52:47
2009
@@ -18,3 +18,6 @@
svn merge --ignore-ancestry -c5510
https://google-web-toolkit.googlecode.com/svn/trunk .
/trunk r5517 was merged into this branch (Fix IE hosted mode)
svn merge -c5517 https://google-web-toolkit.googlecode.com/svn/trunk .
+/trunk 5523 was merged into this branch (Fix Linux web mode tests, OOPHM)
+ svn merge -c5523 https://google-web-toolkit.googlecode.com/svn/trunk .
+
Modified:
branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameTemplate.js
==============================================================================
---
branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameTemplate.js
(original)
+++
branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameTemplate.js
Mon Jun 8 14:52:47 2009
@@ -23,7 +23,7 @@
,$stats = $wnd.__gwtStatsEvent ? function(a) {return
$wnd.__gwtStatsEvent(a);} : null
// These variables gate calling gwtOnLoad; all must be true to start
- ,scriptsDone, loadDone, bodyDone
+ ,injectedScriptsDone, gwtCodeEvaluated, bodyDone,
scriptRequestCompleted, gwtFrameCreated
// If non-empty, an alternate base url for this module
,base = ''
@@ -45,8 +45,11 @@
,onLoadErrorFunc, propertyErrorFunc
// The frame that will contain the compiled script (created in
- // fetchCompiledScript())
+ // maybeCreateGwtFrame())
,scriptFrame
+
+ // Holds the compiled script retreived via XHR until the body is loaded
+ ,compiledScript = ""
; // end of global vars
@@ -83,12 +86,12 @@
return result;
}
- // Called by onScriptLoad(), onInjectionDone(), and onload(). It causes
- // the specified module to be cranked up.
+ // Called by onScriptLoad(), onScriptInjectionDone(),
maybeCreateGwtFrame(),
+ // and onBodyDone(). It causes the specified module to be cranked up.
//
var moduleStarted = false;
function maybeStartModule() {
- if (bodyDone && scriptsDone && loadDone && !moduleStarted) {
+ if (bodyDone && injectedScriptsDone && gwtCodeEvaluated &&
gwtFrameCreated && !moduleStarted) {
moduleStarted = true;
var frameWnd = scriptFrame.contentWindow;
@@ -297,8 +300,8 @@
}
}
- // Fetches the compiled script via XHR, dropping it into 'scriptFrame'
via
- // document.write().
+ // Fetches the compiled script via XHR, saving it to 'compiledScript'
+ // to be added to the page later.
//
function fetchCompiledScript() {
$stats && $stats({
@@ -309,46 +312,55 @@
type: 'moduleRequested'
});
- // to avoid http://support.microsoft.com/kb/927917 only mutate closed
containers - therefore we create a closed container which can be mutated
within xhr.onreadystatechange
- document.write("<div id='__MODULE_NAME__.container'
style='position:absolute; width:0; height:0; border:none'></div>");
-
// Fetch the contents via XHR.
var xhr = newXhr();
xhr.open('GET', base + initialHtml);
xhr.onreadystatechange = function() {
// 4 == DONE
if (xhr.readyState == 4) {
- // Create the script frame, making sure it's invisible, but not
- // "display:none", which keeps some browsers from running code in
it.
- scriptFrame = document.createElement('iframe');
- scriptFrame.src = 'javascript:""';
- scriptFrame.id = '__MODULE_NAME__';
- scriptFrame.style.cssText = 'position:absolute; width:0; height:0;
border:none';
- scriptFrame.tabIndex = -1;
-
document.getElementById("__MODULE_NAME__.container").appendChild(scriptFrame);
-
- // Expose the module function via the iframe's window.name property
- // (this is needed for the compiled script to call back into
- // onScriptLoad()).
- var win = scriptFrame.contentWindow;
- if (isHostedMode()) {
- win.name = '__MODULE_FUNC__';
- }
-
- // Inject the fetched script into the script frame.
- // (this script will call onScriptLoad())
- var doc = win.document;
- doc.open();
- doc.write(xhr.responseText);
- doc.close();
-
- // Make sure we don't leak the xhr object.
+ compiledScript = xhr.responseText;
xhr = null;
+ scriptRequestCompleted = true;
+ maybeCreateGwtFrame();
}
};
xhr.send(null);
}
+ // This is gated by bodyDone because we can't add elements to the
+ // page until the body is ready. It's also gated
by 'scriptRequestCompleted'
+ // so it will not fire until the XHR returns, in case onBodyDone happens
+ // first.
+ function maybeCreateGwtFrame() {
+ if (bodyDone && scriptRequestCompleted && !gwtFrameCreated) {
+ // Create the script frame, making sure it's invisible, but not
+ // "display:none", which keeps some browsers from running code in it.
+ scriptFrame = document.createElement('iframe');
+ scriptFrame.src = 'javascript:""';
+ scriptFrame.id = '__MODULE_NAME__';
+ scriptFrame.style.cssText = 'position:absolute; width:0; height:0;
border:none';
+ scriptFrame.tabIndex = -1;
+ document.body.appendChild(scriptFrame);
+
+ // Expose the module function via the iframe's window.name property
+ // (this is needed for the compiled script to call back into
+ // onScriptLoad()).
+ var win = scriptFrame.contentWindow;
+ if (isHostedMode()) {
+ win.name = '__MODULE_NAME__';
+ }
+
+ // Inject the fetched script into the script frame.
+ // (this script will call onScriptLoad())
+ var doc = win.document;
+ doc.open();
+ doc.write(compiledScript);
+ doc.close();
+ gwtFrameCreated = true;
+ maybeStartModule();
+ }
+ }
+
// --------------- PROPERTY PROVIDERS ---------------
// __PROPERTIES_BEGIN__
@@ -361,15 +373,15 @@
__MODULE_FUNC__.onScriptLoad = function() {
// Mark this module's script as done loading and (possibly) start the
// module.
- loadDone = true;
+ gwtCodeEvaluated = true;
maybeStartModule();
}
// Called when the script injection is complete.
//
- __MODULE_FUNC__.onInjectionDone = function() {
+ __MODULE_FUNC__.onScriptInjectionDone = function() {
// Mark this module's script injection done and (possibly) start the
module.
- scriptsDone = true;
+ injectedScriptsDone = true;
$stats && $stats({
moduleName:'__MODULE_NAME__',
subSystem:'startup',
@@ -431,6 +443,7 @@
function onBodyDone() {
if (!bodyDone) {
bodyDone = true;
+ maybeCreateGwtFrame();
// __MODULE_STYLES_BEGIN__
// Style resources are injected here to prevent operation aborted
errors on ie
// __MODULE_STYLES_END__
@@ -482,7 +495,7 @@
// The 'defer' attribute here is a workaround for strange IE behavior
where
// <script> tags that are doc.writ()en execute *immediately*, rather than
// in document-order, as they should. It has no effect on other browsers.
- $doc.write('<script
defer="defer">__MODULE_FUNC__.onInjectionDone(\'__MODULE_NAME__\')</script>');
+ $doc.write('<script
defer="defer">__MODULE_FUNC__.onScriptInjectionDone(\'__MODULE_NAME__\')</script>');
}
__MODULE_FUNC__();
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
