aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorAnanya Sen2012-05-22 17:59:03 -0700
committerAnanya Sen2012-05-22 17:59:03 -0700
commitae9f289ab9c6fd17ae88fd272dfaa7beabcd649b (patch)
tree9e27878524eb2781a7f3094de0d5ed3f84624980 /js/controllers
parentee54342b5f4fdd41c46543d6402e649e4b3d57cb (diff)
parenta341522e3603c18ab3b93defa894e3be702dd0f4 (diff)
downloadninja-ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b.tar.gz
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 91f4753d..afddaa19 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -500,7 +500,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
500 if(currentDocument) { 500 if(currentDocument) {
501 if(currentDocument.currentView === "design") { 501 if(currentDocument.currentView === "design") {
502 currentDocument.serializeDocument(); 502 currentDocument.serializeDocument();
503 this.application.ninja.selectionController._selectionContainer = null; 503 this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null;
504 currentDocument.model.views.design.propertiesPanel.clear(); 504 currentDocument.model.views.design.propertiesPanel.clear();
505 } 505 }
506 506