Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 3 insertions, 4 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index bb4cd829..7737ae4c 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,15 +61,14 @@ exports.Main = Montage.create(Component, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
-                        componentInstance._montage_metadata.label = componentInstance.identifier = data.name;
-                        componentInstance.element = element;
+                                                componentInstance._montage_metadata.label = componentInstance.identifier = data.name;
+                        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);
                     })
                     .end();