aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/document/templates
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/templates')
-rw-r--r--js/document/templates/app/main.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 0cdf718c..8dc05ba5 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,13 +61,15 @@ exports.Main = Montage.create(Component, {
61 var componentRequire = component[data.name]; 61 var componentRequire = component[data.name];
62 var componentInstance = componentRequire.create(); 62 var componentInstance = componentRequire.create();
63 63
64 componentInstance.element = element;
65 64
65 componentInstance.addEventListener("firstDraw", self, false);
66
67 componentInstance.element = element;
66 componentInstance.needsDraw = true; 68 componentInstance.needsDraw = true;
67 componentInstance.ownerComponent = self; 69 componentInstance.ownerComponent = self;
68 70
69 self.componentToInsert = componentInstance; 71 self.componentToInsert = componentInstance;
70 componentInstance.addEventListener("firstDraw", self, false); 72
71 73
72 callback(componentInstance, element); 74 callback(componentInstance, element);
73 }) 75 })