aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/loader.reel/loader.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/ui/loader.reel/loader.js
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/montage/ui/loader.reel/loader.js')
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/ui/loader.reel/loader.js b/node_modules/montage/ui/loader.reel/loader.js
index 04d03ad4..eeafdba8 100755
--- a/node_modules/montage/ui/loader.reel/loader.js
+++ b/node_modules/montage/ui/loader.reel/loader.js
@@ -229,6 +229,7 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
229 229
230 if (!this.element) { 230 if (!this.element) {
231 this.element = document.documentElement; 231 this.element = document.documentElement;
232 this.attachToParentComponent();
232 } 233 }
233 this.readyToShowLoader = true; 234 this.readyToShowLoader = true;
234 235