diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/document/templates/app/main.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/document/templates/app/main.js')
-rw-r--r-- | js/document/templates/app/main.js | 7 |
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, { | |||
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._montage_metadata.label = componentInstance.identifier = data.name; | 64 | componentInstance._montage_metadata.label = componentInstance.identifier = data.name; |
65 | componentInstance.element = element; | 65 | componentInstance.addEventListener("firstDraw", self, false); |
66 | 66 | ||
67 | componentInstance.element = element; | ||
67 | componentInstance.needsDraw = true; | 68 | componentInstance.needsDraw = true; |
68 | componentInstance.ownerComponent = self; | 69 | componentInstance.ownerComponent = self; |
69 | 70 | ||
70 | self.componentToInsert = componentInstance; | 71 | self.componentToInsert = componentInstance; |
71 | componentInstance.addEventListener("firstDraw", self, false); | ||
72 | |||
73 | callback(componentInstance, element); | 72 | callback(componentInstance, element); |
74 | }) | 73 | }) |
75 | .end(); | 74 | .end(); |