aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-14 16:13:20 -0700
committerJose Antonio Marquez2012-06-14 16:13:20 -0700
commitc72058c9e61f5c1e345482d0eb3741c669612e40 (patch)
tree284475902c0b7af56b15bab735c98074ef6210df /js/helper-classes
parent708d6d4736cdb67bde5ecfb31b34e19d26eef611 (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-c72058c9e61f5c1e345482d0eb3741c669612e40.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js18
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) {