diff options
author | hwc487 | 2012-06-14 16:20:01 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 16:20:01 -0700 |
commit | 2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265 (patch) | |
tree | 54f8fb15e1f073f159e577af8324a447789d7a64 /js/helper-classes | |
parent | f0fc7a5678093cce986bd99fef2c5c88add19b68 (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-2bcc1d3c6c1e31f5ca4310c581602bfa8b8a1265.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/helper-classes')
-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) { |