diff options
author | Jose Antonio Marquez | 2012-05-22 18:02:36 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-22 18:02:36 -0700 |
commit | 27e6e1238ec1adb34aa396074e2559801c7e4314 (patch) | |
tree | d27f27fd071d9df575c6014eed0efee252ff0390 /js/document/document-html.js | |
parent | 75fe4f36a6768d688792bc1925cfa4bfa508ac3e (diff) | |
parent | a341522e3603c18ab3b93defa894e3be702dd0f4 (diff) | |
download | ninja-27e6e1238ec1adb34aa396074e2559801c7e4314.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index d6b4ba95..f92a425c 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -147,9 +147,10 @@ exports.HtmlDocument = Montage.create(Component, { | |||
147 | this.model.userContentTop = this.application.ninja.stage._userContentTop; | 147 | this.model.userContentTop = this.application.ninja.stage._userContentTop; |
148 | 148 | ||
149 | 149 | ||
150 | // Serialize the selection | 150 | // Serialize the selection, the container and grid |
151 | //TODO: Move this property to the design view class | 151 | //TODO: Move this property to the design view class |
152 | this.model.selection = this.application.ninja.selectedElements.slice(0); | 152 | this.model.selection = this.application.ninja.selectedElements.slice(0); |
153 | this.model.selectionContainer = this.application.ninja.currentSelectedContainer; | ||
153 | this.draw3DGrid = this.application.ninja.appModel.show3dGrid; | 154 | this.draw3DGrid = this.application.ninja.appModel.show3dGrid; |
154 | 155 | ||
155 | // Serialize the undo | 156 | // Serialize the undo |
@@ -177,7 +178,7 @@ exports.HtmlDocument = Montage.create(Component, { | |||
177 | 178 | ||
178 | //TODO: Move this property to the design view class | 179 | //TODO: Move this property to the design view class |
179 | this.application.ninja.selectedElements = this.model.selection.slice(0); | 180 | this.application.ninja.selectedElements = this.model.selection.slice(0); |
180 | 181 | // this.application.ninja.currentSelectedContainer = this.model.selectionContainer; | |
181 | this.application.ninja.appModel.show3dGrid = this.draw3DGrid; | 182 | this.application.ninja.appModel.show3dGrid = this.draw3DGrid; |
182 | 183 | ||
183 | // Serialize the undo | 184 | // Serialize the undo |