From e1fe603a7c002073f8ac13623f8cc8dc43efb59d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 31 May 2012 10:27:46 -0700 Subject: fixing selection when switching documents Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 13ab33cc..c9557a57 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -53,9 +53,11 @@ exports.DocumentController = Montage.create(Component, { document.getElementById("iframeContainer").style.display = "block"; document.getElementById("codeViewContainer").style.display = "block"; } else if(this._currentDocument.currentView === "design") { - + this._currentDocument.model.currentView.show(); + this._currentDocument.model.views.design._liveNodeList = this._currentDocument.model.documentRoot.getElementsByTagName('*'); } else { document.getElementById("iframeContainer").style.display = "none"; + this._currentDocument.model.currentView.show(); } } @@ -354,14 +356,8 @@ exports.DocumentController = Montage.create(Component, { if(currentDocument) { if(currentDocument.currentView === "design") { currentDocument.serializeDocument(); - this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null; - currentDocument.model.views.design.propertiesPanel.clear(); } - currentDocument.model.isActive = false; - - currentDocument.model.currentView.hide(); - if(currentDocument.model.parentContainer !== newDocument.model.parentContainer) { currentDocument.model.parentContainer.style["display"] = "none"; newDocument.model.parentContainer.style["display"] = "block"; @@ -382,13 +378,9 @@ exports.DocumentController = Montage.create(Component, { this.application.ninja.stage.hideRulers(); } -// this.application.ninja.stage.clearAllCanvas(); - if(didCreate) { -// newDocument.model.currentView.show(); - if(newDocument.currentView === "design") { - NJevent("onOpenDocument", newDocument); + } else { newDocument.model.parentContainer.style["display"] = "block"; } -- cgit v1.2.3