diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/condition.reel | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
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 | } |