diff options
author | Eric Guzman | 2012-04-23 11:55:55 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-23 11:55:55 -0700 |
commit | cdd1189e349e2974681e2c451e861e5b0db570e4 (patch) | |
tree | d8823c3d050e011032c563d20c1a5f61e67ae740 /node_modules/montage/ui/condition.reel | |
parent | c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff) | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
download | ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'node_modules/montage/ui/condition.reel')
-rwxr-xr-x | node_modules/montage/ui/condition.reel/condition.js | 2 |
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 | } |