Merge pull request #28 from Polymer/master

8/15 master -> stable
googlearchive · Aug 15, 2013 · 7e7c7e9 · 7e7c7e9
2 parents 424e41d + 71b260f
commit 7e7c7e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/html-imports.js b/html-imports.js
@@ -27,10 +27,10 @@ var script = document.querySelector('script[src*="' + thisFile + '"]');
 var src = script.attributes.src.value;
 var basePath = src.slice(0, src.indexOf(thisFile));
 
-if (!window.Loader) {
+if (!window.PolymerLoader) {
   var path = basePath + 'tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
 }
-document.write('<script>Loader.load("' + scopeName + '")</script>');
+document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');
 
 })();
diff --git a/tools b/tools