diff options
author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/document/templates | |
parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/document/templates')
-rw-r--r-- | js/document/templates/app/main.js | 4 |
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(); |