Move the DOMContentLoaded logic into the generated JavaScript

client/tools/htmlconverter.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 #!/usr/bin/env python
 #
 
 """Rewrites HTML files, converting Dart script sections into JavaScript.
 
 Process HTML files, and internally changes script sections that use Dart code
@@ skipping 20 matching lines @@
 DOM_IMPORT_MATCHER = re.compile(
     r"^#import\(['\"]dart\:dom['\"].*\);", re.MULTILINE)
 HTML_IMPORT_MATCHER = re.compile(
     r"^#import\(['\"]dart\:html['\"].*\);", re.MULTILINE)
 
 FROG_NOT_FOUND_ERROR = (
 """Couldn't find compiler: please run the following commands:
    $ cd %s/frog
    $ ./tools/build.py -m release""")
 
-ENTRY_POINT_DOM = """
+ENTRY_POINT = """
 #library('entry');
-#import('dart:dom');
 #import('%s', prefix: 'original');
-main() {
-  window.addEventListener('DOMContentLoaded', (e) => original.main(), false);
-}
-"""
-
-ENTRY_POINT_HTML = """
-#library('entry');
-#import('dart:html');
-#import('%s', prefix: 'original');
-main() {
-  window.on.contentLoaded.add((e) => original.main());
-}
+main() => original.main();

[vsm, 2012/03/28 17:17:57]

I think we can just get rid of this trampoline file and compile code.dart
directly below.

[kasperl, 2012/03/28 17:56:29]

I think the plan is to get rid of htmlconverter.py entirely. I could be wrong.

 """
 
 CSS_TEMPLATE = '<style type="text/css">%s</style>'
 CHROMIUM_SCRIPT_TEMPLATE = '<script type="application/javascript">%s</script>'
 
 DARTIUM_TO_JS_SCRIPT = """
 <script type="text/javascript">
  (function() {
    // Let the user know that Dart is required.
    if (!window.navigator.webkitStartDart) {
@@ skipping 75 matching lines @@
       body = adjustImports(body)
 
       if HTML_IMPORT_MATCHER.search(body):
         useDartHtml = True
 
       inputfile = join(indir, 'code.dart')
       with open(inputfile, 'w') as f:
         f.write("#library('inlinedcode');\n")
         f.write(body)
 
-    if useDartHtml:
-      entryPoint = ENTRY_POINT_HTML
-    else:
-      entryPoint = ENTRY_POINT_DOM
-
     wrappedfile = join(indir, 'entry.dart')
     with open(wrappedfile, 'w') as f:
-      f.write(entryPoint % inputfile)
+      f.write(ENTRY_POINT % inputfile)
 
     status, out, err = execute(self.compileCommand(wrappedfile, outdir),
                                self.verbose)
     if status:
       raise ConverterException('compilation errors')
 
     # Inline the compiled code in the page
     with open(self.outputFileName(wrappedfile, outdir), 'r') as f:
       res = f.read()
 
@@ skipping 396 matching lines @@
     if 'dartium' in options.target:
       convertForDartium(filename, options.out,
           outfile.replace(extension, '-dart' + extension), options.verbose)
   except Exception as e:
     print "%sERROR%s: %s" % (RED_COLOR, NO_COLOR, str(e))
     return 1
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())