diff options
author | Valerio Virgillito | 2012-05-30 10:33:16 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-30 10:33:16 -0700 |
commit | 0c2f181ca565f9c3b68fcfdc7124416e2e2fa647 (patch) | |
tree | f6d5300c528a69305abd30ffea1beee016241375 /js/stage/layout.js | |
parent | 31b094ee21102f99a4021d505bc3a28527c9e23d (diff) | |
parent | d4f2df2a7b3ec79fc54e17f09195dbc37331f051 (diff) | |
download | ninja-0c2f181ca565f9c3b68fcfdc7124416e2e2fa647.tar.gz |
Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into document-bindings-fix
Conflicts:
js/stage/stage-deps.js
js/stage/stage.reel/stage.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/stage/layout.js')
-rwxr-xr-x | js/stage/layout.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 284968e4..71296405 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -136,6 +136,10 @@ exports.Layout = Montage.create(Component, { | |||
136 | value: function() { | 136 | value: function() { |
137 | this.clearCanvas(); | 137 | this.clearCanvas(); |
138 | 138 | ||
139 | // TODO Bind the layoutview mode to the current document | ||
140 | // var mode = this.application.ninja.currentDocument.layoutMode; | ||
141 | if(this.layoutView === "layoutOff") return; | ||
142 | |||
139 | var els = this.elementsToDraw.length; | 143 | var els = this.elementsToDraw.length; |
140 | for(var i = 0, el; i < els; i++){ | 144 | for(var i = 0, el; i < els; i++){ |
141 | this.drawTagOutline(this.elementsToDraw[i]); | 145 | this.drawTagOutline(this.elementsToDraw[i]); |
@@ -147,13 +151,13 @@ exports.Layout = Montage.create(Component, { | |||
147 | value: function(updatePlanes) { | 151 | value: function(updatePlanes) { |
148 | if(updatePlanes) { | 152 | if(updatePlanes) { |
149 | drawUtils.updatePlanes(); | 153 | drawUtils.updatePlanes(); |
154 | this.application.ninja.stage.stageDeps.snapManager._isCacheInvalid = true; | ||
150 | } | 155 | } |
151 | 156 | ||
152 | if(this.stage.appModel.show3dGrid) { | 157 | if(this.stage.appModel.show3dGrid) { |
153 | this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView(); | 158 | this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView(); |
154 | drawUtils.drawWorkingPlane(); | ||
155 | } | 159 | } |
156 | 160 | drawUtils.drawWorkingPlane(); | |
157 | drawUtils.draw3DCompass(); | 161 | drawUtils.draw3DCompass(); |
158 | } | 162 | } |
159 | }, | 163 | }, |
@@ -169,11 +173,6 @@ exports.Layout = Montage.create(Component, { | |||
169 | 173 | ||
170 | if(!item || !this.application.ninja.selectionController.isNodeTraversable(item)) return; | 174 | if(!item || !this.application.ninja.selectionController.isNodeTraversable(item)) return; |
171 | 175 | ||
172 | // TODO Bind the layoutview mode to the current document | ||
173 | // var mode = this.application.ninja.currentDocument.layoutMode; | ||
174 | |||
175 | if(this.layoutView === "layoutOff") return; | ||
176 | |||
177 | // Don't draw outlines for shapes. | 176 | // Don't draw outlines for shapes. |
178 | // TODO Use the element mediator/controller/model to see if its a shape | 177 | // TODO Use the element mediator/controller/model to see if its a shape |
179 | // if (utilsModule.utils.isElementAShape(item)) return; | 178 | // if (utilsModule.utils.isElementAShape(item)) return; |