diff options
author | Valerio Virgillito | 2012-06-01 00:54:02 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-01 00:54:02 -0700 |
commit | 7fcb10270f9e19415f8452c261c2d0c86916a29a (patch) | |
tree | 67c039a42a7ac0eb0b4b6f7e18ab8339a8d00baa /js/document/document-html.js | |
parent | 6079ceedb5b340c78ecd02f27dfa734eedccf512 (diff) | |
download | ninja-7fcb10270f9e19415f8452c261c2d0c86916a29a.tar.gz |
fixed the 3d grid when switching documents and some cleanup
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index c60a12a2..8cc61026 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -117,10 +117,6 @@ exports.HtmlDocument = Montage.create(Component, { | |||
117 | // | 117 | // |
118 | serializeDocument: { | 118 | serializeDocument: { |
119 | value: function () { | 119 | value: function () { |
120 | // There are not needed for now since we cannot change them | ||
121 | //this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing; | ||
122 | //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing; | ||
123 | |||
124 | // Serialize the current scroll position | 120 | // Serialize the current scroll position |
125 | //TODO: Move these properties to the design view class | 121 | //TODO: Move these properties to the design view class |
126 | this.model.scrollLeft = this.application.ninja.stage._scrollLeft; | 122 | this.model.scrollLeft = this.application.ninja.stage._scrollLeft; |
@@ -132,11 +128,6 @@ exports.HtmlDocument = Montage.create(Component, { | |||
132 | // Serialize the selection, the container and grid | 128 | // Serialize the selection, the container and grid |
133 | //TODO: Move this property to the design view class | 129 | //TODO: Move this property to the design view class |
134 | this.model.selection = this.application.ninja.selectedElements.slice(0); | 130 | this.model.selection = this.application.ninja.selectedElements.slice(0); |
135 | this.model.selectionContainer = this.application.ninja.currentSelectedContainer; | ||
136 | this.draw3DGrid = this.application.ninja.appModel.show3dGrid; | ||
137 | |||
138 | // Serialize the undo | ||
139 | // TODO: Save the montage undo queue | ||
140 | 131 | ||
141 | // Pause the videos | 132 | // Pause the videos |
142 | //TODO: Move these to be handled on the show/hide methods in the view | 133 | //TODO: Move these to be handled on the show/hide methods in the view |
@@ -147,27 +138,15 @@ exports.HtmlDocument = Montage.create(Component, { | |||
147 | // | 138 | // |
148 | deserializeDocument: { | 139 | deserializeDocument: { |
149 | value: function () { | 140 | value: function () { |
150 | // There are not needed for now since we cannot change them | ||
151 | //this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing; | ||
152 | //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing; | ||
153 | |||
154 | // Deserialize the current scroll position | 141 | // Deserialize the current scroll position |
155 | //TODO: Move these properties to the design view class | 142 | //TODO: Move these properties to the design view class |
156 | this.application.ninja.stage._scrollLeft = this.model.scrollLeft; | 143 | this.application.ninja.stage._scrollLeft = this.model.scrollLeft; |
157 | this.application.ninja.stage._scrollTop = this.model.scrollTop; | 144 | this.application.ninja.stage._scrollTop = this.model.scrollTop; |
158 | this.application.ninja.stage._userContentLeft = this.model.userContentLeft; | 145 | this.application.ninja.stage._userContentLeft = this.model.userContentLeft; |
159 | this.application.ninja.stage._userContentTop = this.model.userContentTop; | 146 | this.application.ninja.stage._userContentTop = this.model.userContentTop; |
160 | |||
161 | //TODO: Move this property to the design view class | ||
162 | this.application.ninja.selectedElements = this.model.selection.slice(0); | ||
163 | // this.application.ninja.currentSelectedContainer = this.model.selectionContainer; | ||
164 | this.application.ninja.appModel.show3dGrid = this.draw3DGrid; | ||
165 | 147 | ||
166 | // Serialize the undo | 148 | // Serialize the undo |
167 | // TODO: Save the montage undo queue | 149 | // TODO: Save the montage undo queue |
168 | |||
169 | //TODO: Move this to the document controller | ||
170 | this.model.isActive = true; | ||
171 | } | 150 | } |
172 | } | 151 | } |
173 | //////////////////////////////////////////////////////////////////// | 152 | //////////////////////////////////////////////////////////////////// |