aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/condition.reel/condition.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-25 13:34:04 -0700
committerNivesh Rajbhandari2012-04-25 13:34:04 -0700
commit32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch)
treefbf05f2dfc91e57ab9598046ff16798ea0ae1966 /node_modules/montage/ui/condition.reel/condition.js
parent60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'node_modules/montage/ui/condition.reel/condition.js')
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/condition.reel/condition.js b/node_modules/montage/ui/condition.reel/condition.js
index 064f51b7..bcb0e957 100755
--- a/node_modules/montage/ui/condition.reel/condition.js
+++ b/node_modules/montage/ui/condition.reel/condition.js
@@ -148,7 +148,7 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond
148 this.content = document.createElement("div"); 148 this.content = document.createElement("div");
149 childList = Array.prototype.slice.call(this._element.childNodes, 0); 149 childList = Array.prototype.slice.call(this._element.childNodes, 0);
150 for (i = 0; (childElement = childList[i]); i++) { 150 for (i = 0; (childElement = childList[i]); i++) {
151 childElement.parentElement.removeChild(childElement); 151 childElement.parentNode.removeChild(childElement);
152 this.content.appendChild(childElement); 152 this.content.appendChild(childElement);
153 } 153 }
154 } 154 }