diff options
author | Valerio Virgillito | 2012-05-29 15:32:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-29 15:32:47 -0700 |
commit | 5d7dff15e1e603e3b37057b9843e4b1eef1b2dca (patch) | |
tree | 25c2a5a1b4a273fc32a555cf662b6963a5770885 /js/ninja.reel/ninja.js | |
parent | 4fa08fe2ce439a5f5c248c568f72d3828ee11b36 (diff) | |
download | ninja-5d7dff15e1e603e3b37057b9843e4b1eef1b2dca.tar.gz |
cleanup and handling the document views in the document controller for now.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 0b4fd14d..3659f1f8 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -296,7 +296,7 @@ exports.Ninja = Montage.create(Component, { | |||
296 | } | 296 | } |
297 | }, | 297 | }, |
298 | 298 | ||
299 | handleOnOpenDocument: { | 299 | openDocument: { |
300 | value: function(doc) { | 300 | value: function(doc) { |
301 | 301 | ||
302 | 302 | ||
@@ -306,25 +306,18 @@ exports.Ninja = Montage.create(Component, { | |||
306 | // TODO: Remove this when integrating the next montage | 306 | // TODO: Remove this when integrating the next montage |
307 | this.documentList.selectedObjects = [doc]; | 307 | this.documentList.selectedObjects = [doc]; |
308 | 308 | ||
309 | // TODO: Find a better place for this | ||
310 | doc.model.currentView.show(); | ||
311 | |||
312 | // TODO: Bind directly to the model of the document in components instead of this property | 309 | // TODO: Bind directly to the model of the document in components instead of this property |
313 | this.currentSelectedContainer = doc.model.documentRoot; | 310 | this.currentSelectedContainer = doc.model.documentRoot; |
314 | 311 | ||
315 | /* | 312 | // if(this.currentDocument.model.documentRoot) { |
316 | this.currentDocument = event.detail; | 313 | // this.currentSelectedContainer = this.currentDocument.model.documentRoot; |
317 | 314 | // } else { | |
318 | if(this.currentDocument.model.documentRoot) { | 315 | // alert("The current document has not loaded yet"); |
319 | this.currentSelectedContainer = this.currentDocument.model.documentRoot; | 316 | // return; |
320 | } else { | 317 | // } |
321 | alert("The current document has not loaded yet"); | ||
322 | return; | ||
323 | } | ||
324 | 318 | ||
325 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; | 319 | // this.appModel.show3dGrid = this.currentDocument.draw3DGrid; |
326 | NJevent("openDocument"); | 320 | // NJevent("openDocument"); |
327 | */ | ||
328 | 321 | ||
329 | } | 322 | } |
330 | }, | 323 | }, |