aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 09:59:01 -0700
committerJose Antonio Marquez2012-06-27 09:59:01 -0700
commitca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (patch)
tree2bf23250a605ca42a33f7bc75698357e0258d624 /js/document/templates
parent245e70117f9605dc5603328c97685b2e5a10f220 (diff)
parent2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff)
downloadninja-ca1e79d4dc36a55c47b6f8cb92069eafc95383b5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/document/templates')
-rw-r--r--js/document/templates/app/main.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 8dc05ba5..0da1b87e 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,7 +61,7 @@ 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 64 componentInstance.identifier = data.identifier;
65 componentInstance.addEventListener("firstDraw", self, false); 65 componentInstance.addEventListener("firstDraw", self, false);
66 66
67 componentInstance.element = element; 67 componentInstance.element = element;
@@ -69,8 +69,6 @@ exports.Main = Montage.create(Component, {
69 componentInstance.ownerComponent = self; 69 componentInstance.ownerComponent = self;
70 70
71 self.componentToInsert = componentInstance; 71 self.componentToInsert = componentInstance;
72
73
74 callback(componentInstance, element); 72 callback(componentInstance, element);
75 }) 73 })
76 .end(); 74 .end();