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>

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, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
-                        componentInstance.element = element;
 
+                        componentInstance.addEventListener("firstDraw", self, false);
+
+                        componentInstance.element = element;
                         componentInstance.needsDraw = true;
                         componentInstance.ownerComponent = self;
 
                         self.componentToInsert = componentInstance;
-                        componentInstance.addEventListener("firstDraw", self, false);
+
 
                         callback(componentInstance, element);
                     })