Author: [email protected] Date: Wed Jun 10 12:10:45 2009 New Revision: 5533 Modified: branches/snapshot-2009.06.02-r5498/branch-info.txt branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java
Log: Merge trunk r5532 into the 6/2 snapshot branch. ------------------------------------------------------------------------ r5532 | [email protected] | 2009-06-10 13:49:08 -0400 (Wed, 10 Jun 2009) | 3 lines Fixes missing <head> element in the script frame on Safari 3 (issue 3738). Review: http://gwt-code-reviews.appspot.com/34834 ------------------------------------------------------------------------ svn merge -c5532 https://google-web-toolkit.googlecode.com/svn/trunk . 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 Wed Jun 10 12:10:45 2009 @@ -22,4 +22,5 @@ svn merge -c5523 https://google-web-toolkit.googlecode.com/svn/trunk . /trunk 5530 was merged into this branch (more fixes for 5523) svn merge -c5530 https://google-web-toolkit.googlecode.com/svn/trunk . - +/trunk 5532 was merged into this branch (yet more fixes from 5523) + svn merge -c5532 https://google-web-toolkit.googlecode.com/svn/trunk . Modified: branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java ============================================================================== --- branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java (original) +++ branches/snapshot-2009.06.02-r5498/dev/core/src/com/google/gwt/core/linker/IFrameLinker.java Wed Jun 10 12:10:45 2009 @@ -208,7 +208,7 @@ out.print("if ($wnd." + context.getModuleFunctionName() + ") $wnd." + context.getModuleFunctionName() + ".onScriptLoad();"); out.newline(); - out.print("--></script>"); + out.print("--></script></body></html>"); out.newlineOpt(); return out.toString(); @@ -249,10 +249,11 @@ private String getModulePrefix(LinkerContext context, String strongName, boolean supportRunAsync) { DefaultTextOutput out = new DefaultTextOutput(context.isOutputCompact()); + out.print("<html>"); out.newlineOpt(); // Setup the well-known variables. - out.print("<script>"); + out.print("<head><script>"); out.newlineOpt(); out.print("var $gwt_version = \"" + About.GWT_VERSION_NUM + "\";"); out.newlineOpt(); @@ -305,8 +306,9 @@ + "',subSystem:'startup',evtGroup:'moduleStartup'" + ",millis:(new Date()).getTime(),type:'moduleEvalStart'});"); out.newlineOpt(); - out.print("</script>"); + out.print("</script></head>"); out.newlineOpt(); + out.print("<body>"); out.newlineOpt(); // Begin a script block inside the body. It's commented out so that the --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
