aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-22 16:26:41 -0800
committerArmen Kesablyan2012-02-22 16:26:41 -0800
commit0bd1cefea2ab350fad1a891bdc926053b799aafc (patch)
tree962f559fcc02a3dfeb297d59907e40fa153453f3 /node_modules/montage
parent695bc5082f48dddf66ce31480a4faefc067b38bd (diff)
parent2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff)
downloadninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'node_modules/montage')
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/ui/condition.reel/condition.js b/node_modules/montage/ui/condition.reel/condition.js
index e88d96a1..053adb16 100755
--- a/node_modules/montage/ui/condition.reel/condition.js
+++ b/node_modules/montage/ui/condition.reel/condition.js
@@ -162,6 +162,7 @@ exports.Condition = Montage.create(Component, /** @lends module:"montage/ui/cond
162 // this keeps us from having to keep track of the range or risk losing 162 // this keeps us from having to keep track of the range or risk losing
163 // a reference to the elements when they're extracted 163 // a reference to the elements when they're extracted
164 conditionContentRange.surroundContents(this.content); 164 conditionContentRange.surroundContents(this.content);
165 conditionContentRange.deleteContents(); //remove the contents that are part of the original structure
165 } 166 }
166 167
167 var slotRoot = document.createElement("div"); 168 var slotRoot = document.createElement("div");