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 @@ - + \ No newline at end of file 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); }