Merge pull request #25 from Polymer/master

8/1 master -> stable

build.json

@@ -1,5 +1,5 @@
 [
-  "src/Parser.js",
   "src/HTMLImports.js",
+  "src/Parser.js",
   "src/boot.js"
 ]

html-imports.js

@@ -9,9 +9,9 @@
 var thisFile = 'html-imports.js';
 var scopeName = 'HTMLImports';
 var modules = [
-    'src/Parser.js',
-    'src/HTMLImports.js',
-    'src/boot.js'
+  'src/HTMLImports.js',
+  'src/Parser.js',
+  'src/boot.js'
 ];
 
 // export 
@@ -30,7 +30,7 @@ var basePath = src.slice(0, src.indexOf(thisFile));
 if (!window.Loader) {
   var path = basePath + 'tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
-} 
+}
 document.write('<script>Loader.load("' + scopeName + '")</script>');
-  
+
 })();

src/HTMLImports.js

@@ -36,6 +36,8 @@ var STYLE_LINK_TYPE = 'stylesheet';
 // linked style sheets in an <element> are loaded, and the content gets path fixups
 // inline style sheets get path fixups when their containing import modifies paths
 
+var loader;
+
 var importer = {
   documents: {},
   cache: {},
@@ -169,8 +171,6 @@ function makeDocument(resource, url) {
   return doc;
 }
 
-var loader;
-
 var Loader = function(inOnLoad, inOnComplete) {
   this.onload = inOnLoad;
   this.oncomplete = inOnComplete;