Merge pull request #581 from kevmoo/polymer

lib/boot.js

 // Copyright (c) 2013, 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.
 
 // This script dynamically prepares a set of files to run polymer.dart. It uses
 // the html_import polyfill to search for all imported files, then
 // it inlines all <polymer-element> definitions on the top-level page (needed by
 // registerPolymerElement), and it removes script tags that appear inside
 // those tags. It finally rewrites the main entrypoint to call an initialization
 // function on each of the declared <polymer-elements>.
@@ skipping 82 matching lines @@
       var time = new Date().getTime();
       return url + '?' + time;
     } else {
       // TODO(sigmund): investigate how to eliminate the warning in Dartium
       // (changing to text/javascript hides the warning, but seems wrong).
       return "data:application/dart;base64," + window.btoa(script.textContent);
     }
   }
 
   // Moves <polymer-elements> from imported documents into the top-level page.
-  function inlinePolymerElements(content, seen) {
+  function inlinePolymerElements(content, ref, seen) {
     if (!seen) seen = {};
     var links = content.querySelectorAll('link[rel="import"]');
-
-    if (content != document) { // no need to do anything for the top-level page
-      var elements = content.querySelectorAll('polymer-element');
-      var ref = document.body.firstChild;
-      for (var i = 0; i < elements.length; ++i)  {
-        document.body.insertBefore(elements[i], ref);
-      }
-    }
-
     for (var i = 0; i < links.length; i++) {
       var link = links[i].import;
       if (seen[link.href]) continue;
       seen[link.href] = link;
-      inlinePolymerElements(link.content, seen);
+      inlinePolymerElements(link.content, ref, seen);
+    }
+
+    if (content != document) { // no need to do anything for the top-level page
+      var elements = content.querySelectorAll('polymer-element');
+      for (var i = 0; i < elements.length; i++)  {
+        document.body.insertBefore(elements[i], ref);
+      }
     }
   }
 
   // Creates a Dart program that imports [urls] and [mainUrl] and invokes the
   // _init methods of each library in urls (if present) followed by the main
   // method of [mainUrl].
   function createMain(urls, mainUrl) {
     var imports = Array(urls.length + 2);
     for (var i = 0; i < urls.length; ++i) {
       imports[i] = 'import "' + urls[i] + '" as i' + i + ';';
     }
     imports[urls.length] = 'import "package:polymer/polymer.dart" as polymer;';
     imports[urls.length + 1 ] = 'import "' + mainUrl + '" as userMain;';
     var firstArg = urls.length == 0 ? '[]' :
-        ('[\n      "' + urls.join('",\n "') + '"\n      ]');
+        ('[\n      "' + urls.join('",\n      "') + '"\n     ]');
     return (imports.join('\n') +
         '\n\nmain() {\n' +
         '  polymer.initPolymer(' + firstArg + ', userMain.main);\n' +
         '}\n');
   }
 
   // Finds all top-level <script> tags, and <script> tags in custom elements
   // and merges them into a single entrypoint.
   function mergeScripts() {
     var scripts = document.getElementsByTagName("script");
@@ skipping 27 matching lines @@
     }
   }
 
   var alreadyRan = false;
   window.addEventListener('HTMLImportsLoaded', function (e) {
     if (alreadyRan) {
       console.warn('HTMLImportsLoaded fired again.');
       return;
     }
     alreadyRan = true;
-    inlinePolymerElements(document);
+    var ref = document.body.children[0];
+    inlinePolymerElements(document, ref);
     mergeScripts();
     if (!navigator.webkitStartDart()) {
       document.body.innerHTML = 'This build has expired. Please download a ' +
           'new Dartium at http://www.dartlang.org/dartium/index.html';
     }
   });
 })();