diff options
author | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
commit | 69ca67093bb53188dca5437e0bfbfb7f676ada85 (patch) | |
tree | cc2b387c796b0f34f1ab00a7c542c335d52005e9 /js/controllers/document-controller.js | |
parent | b7f048624c07a1186cca080bf4c9a87af7d53f35 (diff) | |
parent | 7fcb10270f9e19415f8452c261c2d0c86916a29a (diff) | |
download | ninja-69ca67093bb53188dca5437e0bfbfb7f676ada85.tar.gz |
Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix
Conflicts:
js/stage/stage.reel/stage.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/document-controller.js')
-rwxr-xr-x | js/controllers/document-controller.js | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 0fe1636a..a90375af 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -348,26 +348,5 @@ exports.DocumentController = Montage.create(Component, { | |||
348 | value: function(document) { | 348 | value: function(document) { |
349 | document.closeDocument(this.application.ninja, this.application.ninja.closeFile); | 349 | document.closeDocument(this.application.ninja, this.application.ninja.closeFile); |
350 | } | 350 | } |
351 | }, | ||
352 | |||
353 | switchDocuments: { | ||
354 | value: function(currentDocument, newDocument, didCreate) { | ||
355 | |||
356 | if(currentDocument.currentView === "design") { | ||
357 | currentDocument.serializeDocument(); | ||
358 | } | ||
359 | |||
360 | if(didCreate) { | ||
361 | if(newDocument.currentView === "design") { | ||
362 | |||
363 | } else { | ||
364 | newDocument.model.parentContainer.style["display"] = "block"; | ||
365 | } | ||
366 | } else { | ||
367 | if(newDocument.currentView === "design") { | ||
368 | newDocument.deserializeDocument(); | ||
369 | } | ||
370 | } | ||
371 | } | ||
372 | } | 351 | } |
373 | }); | 352 | }); |