aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-18 09:52:15 -0700
committerJose Antonio Marquez2012-05-18 09:52:15 -0700
commit6c70c8bf28c2239d29f3abecc8a7ea59b2860bab (patch)
treec506b28bc82f74072f324d920105737726d5ecaf /js/document/document-html.js
parent015df99dff8306f8839affd22cdd7689eb00e180 (diff)
parent24d1873302b2fffc25d254e15e8aa36f59eedb88 (diff)
downloadninja-6c70c8bf28c2239d29f3abecc8a7ea59b2860bab.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-xjs/document/document-html.js22
1 files changed, 18 insertions, 4 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 56d9db02..0037c94d 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -119,8 +119,6 @@ exports.HtmlDocument = Montage.create(Component, {
119 this._observer = null; 119 this._observer = null;
120 //Making callback after view is loaded 120 //Making callback after view is loaded
121 this.loaded.callback.call(this.loaded.context, this); 121 this.loaded.callback.call(this.loaded.context, this);
122 //Setting opacity to be viewable after load
123 this.model.views.design.iframe.style.opacity = 1;
124 } 122 }
125 }, 123 },
126 //////////////////////////////////////////////////////////////////// 124 ////////////////////////////////////////////////////////////////////
@@ -136,7 +134,7 @@ exports.HtmlDocument = Montage.create(Component, {
136 // 134 //
137 serializeDocument: { 135 serializeDocument: {
138 value: function () { 136 value: function () {
139 // There are not needed for now ssince we cannot change them 137 // There are not needed for now since we cannot change them
140 //this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing; 138 //this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing;
141 //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing; 139 //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
142 140
@@ -152,13 +150,29 @@ exports.HtmlDocument = Montage.create(Component, {
152 150
153 // Pause the videos 151 // Pause the videos
154 this.model.views.design.pauseVideos(); 152 this.model.views.design.pauseVideos();
153
154 this.model.isActive = false;
155 } 155 }
156 }, 156 },
157 //////////////////////////////////////////////////////////////////// 157 ////////////////////////////////////////////////////////////////////
158 // 158 //
159 deserializeDocument: { 159 deserializeDocument: {
160 value: function () { 160 value: function () {
161 //TODO: Import functionality 161 // There are not needed for now since we cannot change them
162 //this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
163 //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
164
165 // Deserialize the current scroll position
166 // TODO: Implement
167
168 this.application.ninja.selectedElements = this.model.selection.slice(0);
169
170 this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
171
172 // Serialize the undo
173 // TODO: Save the montage undo queue
174
175 this.model.isActive = true;
162 } 176 }
163 } 177 }
164 //////////////////////////////////////////////////////////////////// 178 ////////////////////////////////////////////////////////////////////