From 5661b1c9ee0d4cb0f253dff11fe7347aee5a563d Mon Sep 17 00:00:00 2001
From: Harry Love <harrylove@gmail.com>
Date: Mon, 9 Jan 2012 15:20:08 -0800
Subject: [PATCH 1/2] Change demo flexie src call to use relative path

---
 demo/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/index.html b/demo/index.html
index f9493fd..42bc5dc 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -103,6 +103,6 @@
 		<!-- <script src="https://ajax.googleapis.com/ajax/libs/dojo/1.5/dojo/dojo.xd.js" type="text/javascript"></script> -->
 		
 		<!-- Flexie -->
-		<script src="/src/flexie.js" type="text/javascript"></script>
+		<script src="../src/flexie.js" type="text/javascript"></script>
 	</body>
 </html>
\ No newline at end of file

From f3e8df82e1d8c5250adfccc28cd1ca24fc570ce5 Mon Sep 17 00:00:00 2001
From: Harry Love <harrylove@gmail.com>
Date: Mon, 9 Jan 2012 15:28:11 -0800
Subject: [PATCH 2/2] Fixes issue #32

Check for existence of object before assigning. Fixes "Uncaught
TypeError: Cannot read property 'children' of undefined"
---
 src/flexie.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/flexie.js b/src/flexie.js
index 631deea..0f82d40 100755
--- a/src/flexie.js
+++ b/src/flexie.js
@@ -1067,14 +1067,14 @@ var Flexie = (function (win, doc) {
 		    isNested;
 		
 		while (parent.FLX_DOM_ID) {
-			obj = FLEX_BOXES[parent.FLX_DOM_ID];
-			matrix = createMatchMatrix(obj.children, sanitizeChildren(parent, parent.childNodes), NULL);
-			
-			totalFlex += matrix.total;
-			isNested = TRUE;
-			
-			parent = parent.parentNode;
-		}
+            if (FLEX_BOXES[parent.FLX_DOM_ID]) {
+                obj = FLEX_BOXES[parent.FLX_DOM_ID];
+                matrix = createMatchMatrix(obj.children, sanitizeChildren(parent, parent.childNodes), NULL);
+                totalFlex += matrix.total;
+                isNested = TRUE;
+            }
+            parent = parent.parentNode;
+        }
 		
 		return {
 			nested : isNested,
@@ -1895,7 +1895,7 @@ var Flexie = (function (win, doc) {
 			while (parent) {
 				flex = FLEX_BOXES[parent.FLX_DOM_ID];
 				
-				if (flex) {
+				if (flex && flex.nodes) {
 					cleanPositioningProperties(flex.nodes);
 					self.setup(flex.target, flex.nodes, flex);
 				}