aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-22 12:18:25 -0800
committerAnanya Sen2012-02-22 12:18:25 -0800
commitdbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch)
treeace2a2415ef14662c27cdb2528914bef0a7f9208 /js/ninja.reel/ninja.js
parent9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff)
parent27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff)
downloadninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js9
1 files changed, 0 insertions, 9 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 399d7b4d..6efeef8a 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -168,19 +168,10 @@ exports.Ninja = Montage.create(Component, {
168 168
169 this.appModel.show3dGrid = this.currentDocument.draw3DGrid; 169 this.appModel.show3dGrid = this.currentDocument.draw3DGrid;
170 170
171 this.currentDocument._document.body.addEventListener("userTemplateDidLoad", this.userTemplateDidLoad.bind(this), false);
172
173
174 NJevent("openDocument"); 171 NJevent("openDocument");
175 } 172 }
176 }, 173 },
177 174
178 userTemplateDidLoad: {
179 value: function(){
180 this.currentSelectedContainer = this.currentDocument.documentRoot;
181 }
182 },
183
184 executeLivePreview: { 175 executeLivePreview: {
185 value: function() { 176 value: function() {
186 var background, overflow, transitionStopRule; 177 var background, overflow, transitionStopRule;