aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-01 00:54:02 -0700
committerValerio Virgillito2012-06-01 00:54:02 -0700
commit7fcb10270f9e19415f8452c261c2d0c86916a29a (patch)
tree67c039a42a7ac0eb0b4b6f7e18ab8339a8d00baa /js/ninja.reel
parent6079ceedb5b340c78ecd02f27dfa734eedccf512 (diff)
downloadninja-7fcb10270f9e19415f8452c261c2d0c86916a29a.tar.gz
fixed the 3d grid when switching documents and some cleanup
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html5
-rwxr-xr-xjs/ninja.reel/ninja.js8
2 files changed, 4 insertions, 9 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a6422f6e..0c0944e7 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -25,7 +25,10 @@
25 }, 25 },
26 26
27 "appModel": { 27 "appModel": {
28 "prototype": "js/models/app-model" 28 "prototype": "js/models/app-model",
29 "bindings": {
30 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
31 }
29 }, 32 },
30 33
31 "materialsModel": { 34 "materialsModel": {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index e9e1e31c..9593973e 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -296,9 +296,6 @@ exports.Ninja = Montage.create(Component, {
296 296
297 openDocument: { 297 openDocument: {
298 value: function(doc) { 298 value: function(doc) {
299
300
301
302 this.documentList.content.push(doc); 299 this.documentList.content.push(doc);
303 // This is not needed with the latest 0.10 montage. 300 // This is not needed with the latest 0.10 montage.
304 // TODO: Remove this when integrating the next montage 301 // TODO: Remove this when integrating the next montage
@@ -308,11 +305,6 @@ exports.Ninja = Montage.create(Component, {
308 // TODO: Bind directly to the model of the document in components instead of this property 305 // TODO: Bind directly to the model of the document in components instead of this property
309 this.currentSelectedContainer = doc.model.documentRoot; 306 this.currentSelectedContainer = doc.model.documentRoot;
310 } 307 }
311
312
313// this.appModel.show3dGrid = this.currentDocument.draw3DGrid;
314
315
316 } 308 }
317 }, 309 },
318 310