diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/helper-classes/3D/draw-utils.js | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/helper-classes/3D/draw-utils.js')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index bef1e435..6a84c86b 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -117,7 +117,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
117 | }, | 117 | }, |
118 | 118 | ||
119 | initializeFromDocument:{ | 119 | initializeFromDocument:{ |
120 | value:function(){ | 120 | value:function(adjustScrollOffsets){ |
121 | var i, | 121 | var i, |
122 | documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true), | 122 | documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true), |
123 | stage = this.application.ninja.stage, | 123 | stage = this.application.ninja.stage, |
@@ -144,13 +144,15 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
144 | for(i=0; i<len; i++) { | 144 | for(i=0; i<len; i++) { |
145 | elt = documentRootChildren[i]; | 145 | elt = documentRootChildren[i]; |
146 | plane = this.addElement(elt); | 146 | plane = this.addElement(elt); |
147 | l = plane._rect.m_left - docLeft; | 147 | if(adjustScrollOffsets) { |
148 | t = plane._rect.m_top - docTop; | 148 | l = plane._rect.m_left - docLeft; |
149 | if(l < minLeft) { | 149 | t = plane._rect.m_top - docTop; |
150 | minLeft = l; | 150 | if(l < minLeft) { |
151 | } | 151 | minLeft = l; |
152 | if(t < minTop) { | 152 | } |
153 | minTop = t; | 153 | if(t < minTop) { |
154 | minTop = t; | ||
155 | } | ||
154 | } | 156 | } |
155 | } | 157 | } |
156 | if(minLeft !== initL) { | 158 | if(minLeft !== initL) { |