diff options
author | Valerio Virgillito | 2012-05-07 16:21:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-07 16:21:51 -0700 |
commit | a117cbed5df85c15a42776d3381904eff12e751f (patch) | |
tree | 10f157d2688a4642e79e34301bdc4871fb64bca9 /js/document/document-html.js | |
parent | c9ae789c554a54a1e8702a3bf4e55c529568f4c1 (diff) | |
parent | 1f09edbdc5d557c3e3fb71c0a1719014adb0ce3a (diff) | |
download | ninja-a117cbed5df85c15a42776d3381904eff12e751f.tar.gz |
Merge pull request #198 from joseeight/Document
Cleaning up some CSS parsers.
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 79fe461b..567e4455 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -81,6 +81,10 @@ exports.HtmlDocument = Montage.create(Component, { | |||
81 | } | 81 | } |
82 | // | 82 | // |
83 | if (view === 'design') { | 83 | if (view === 'design') { |
84 | //TODO: Remove reference and use as part of model | ||
85 | this.currentView = 'design'; | ||
86 | //Setting current view object to design | ||
87 | this.model.currentView = this.model.views.design; | ||
84 | //Showing design iFrame | 88 | //Showing design iFrame |
85 | this.model.views.design.show(); | 89 | this.model.views.design.show(); |
86 | this.model.views.design.iframe.style.opacity = 0; | 90 | this.model.views.design.iframe.style.opacity = 0; |
@@ -118,8 +122,6 @@ exports.HtmlDocument = Montage.create(Component, { | |||
118 | this.loaded.callback.call(this.loaded.context, this); | 122 | this.loaded.callback.call(this.loaded.context, this); |
119 | //Setting opacity to be viewable after load | 123 | //Setting opacity to be viewable after load |
120 | this.model.views.design.iframe.style.opacity = 1; | 124 | this.model.views.design.iframe.style.opacity = 1; |
121 | //TODO: Remove, this is a temp hard-coded hack | ||
122 | this.application.ninja.appModel.show3dGrid = true; | ||
123 | } | 125 | } |
124 | } | 126 | } |
125 | //////////////////////////////////////////////////////////////////// | 127 | //////////////////////////////////////////////////////////////////// |