From 776c21056268e7013073e8e8694e86ebf4e328bc Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Wed, 17 Jul 2013 11:09:23 -0700
Subject: [PATCH 1/6] move variable definition

---
 src/HTMLImports.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/HTMLImports.js b/src/HTMLImports.js
index db0239d..a77e716 100644
--- a/src/HTMLImports.js
+++ b/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;

From 6b34497ff241be30d6e5482c148d8a8c183c20bc Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Wed, 17 Jul 2013 13:02:15 -0700
Subject: [PATCH 2/6] freshen tools

---
 tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools b/tools
index 2a2bcbb..d4194fe 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 2a2bcbbb093200b0118b440f88172986846ca659
+Subproject commit d4194fed0aa30e89fd3ba405f64ade3e45bd6d47

From caba990146eee1183658a24e81bf4940a5ca2c23 Mon Sep 17 00:00:00 2001
From: sigmundch <sigmund@google.com>
Date: Thu, 25 Jul 2013 10:49:56 -0700
Subject: [PATCH 3/6] Update build.json: reorder files

With the previous order I am seeing errors when loading the html-imports.min.js file ("Uncaught ReferenceError: HTMLImports is not defined").
---
 build.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.json b/build.json
index d957ebb..5d9aa23 100644
--- a/build.json
+++ b/build.json
@@ -1,5 +1,5 @@
 [
-  "src/Parser.js",
+  "src/boot.js",
   "src/HTMLImports.js",
-  "src/boot.js"
+  "src/Parser.js"
 ]

From 1e7de3ca81e992e1c4c4b9695f1540e2855e6485 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Mon, 29 Jul 2013 17:11:34 -0700
Subject: [PATCH 4/6] fix order in loader and build config

---
 build.json      | 4 ++--
 html-imports.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.json b/build.json
index 5d9aa23..db860d2 100644
--- a/build.json
+++ b/build.json
@@ -1,5 +1,5 @@
 [
-  "src/boot.js",
   "src/HTMLImports.js",
-  "src/Parser.js"
+  "src/Parser.js",
+  "src/boot.js"
 ]
diff --git a/html-imports.js b/html-imports.js
index 74037ad..b898526 100644
--- a/html-imports.js
+++ b/html-imports.js
@@ -9,8 +9,8 @@
 var thisFile = 'html-imports.js';
 var scopeName = 'HTMLImports';
 var modules = [
-    'src/Parser.js',
     'src/HTMLImports.js',
+    'src/Parser.js',
     'src/boot.js'
 ];
 

From 8ffbbc062665a1e6ce0bf1597d949883c455db91 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Mon, 29 Jul 2013 16:55:06 -0700
Subject: [PATCH 5/6] whitespace

---
 html-imports.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html-imports.js b/html-imports.js
index b898526..da41d91 100644
--- a/html-imports.js
+++ b/html-imports.js
@@ -9,9 +9,9 @@
 var thisFile = 'html-imports.js';
 var scopeName = 'HTMLImports';
 var modules = [
-    'src/HTMLImports.js',
-    'src/Parser.js',
-    'src/boot.js'
+  'src/Parser.js',
+  'src/HTMLImports.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>');
-  
+
 })();

From fc5ac2e020b702ce4e812fd06d3e4fdd57600367 Mon Sep 17 00:00:00 2001
From: "Scott J. Miles" <sjmiles@google.com>
Date: Tue, 30 Jul 2013 22:17:17 -0700
Subject: [PATCH 6/6] fix ordering that got mixed up in commit races

---
 html-imports.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html-imports.js b/html-imports.js
index da41d91..565672b 100644
--- a/html-imports.js
+++ b/html-imports.js
@@ -9,8 +9,8 @@
 var thisFile = 'html-imports.js';
 var scopeName = 'HTMLImports';
 var modules = [
-  'src/Parser.js',
   'src/HTMLImports.js',
+  'src/Parser.js',
   'src/boot.js'
 ];