aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-25 15:23:34 -0700
committerJose Antonio Marquez2012-06-25 15:23:34 -0700
commit1e0864f414bcc97efdee28be4a71a0920cfed450 (patch)
tree26d00a880ef23ae3fbacdd8e78c3070fef20cb69 /js
parent8a3c009fc6b0c9ec461627a631f19535047e951c (diff)
parentd2e88bb251efb29f13911942f1f91101715c727e (diff)
downloadninja-1e0864f414bcc97efdee28be4a71a0920cfed450.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js44
-rwxr-xr-xjs/stage/stage.reel/stage.js21
2 files changed, 55 insertions, 10 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 87151964..9c4f31b7 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -73,6 +73,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
73 73
74 // Properties that require element planes to be updated 74 // Properties that require element planes to be updated
75 _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false }, 75 _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
76 _recalculateScrollOffsets : { value: false },
76 77
77 /////////////////////////////////////////////////////////////////////// 78 ///////////////////////////////////////////////////////////////////////
78 // Property accessors 79 // Property accessors
@@ -117,7 +118,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
117 }, 118 },
118 119
119 initializeFromDocument:{ 120 initializeFromDocument:{
120 value:function(adjustScrollOffsets){ 121 value:function(adjustScrollOffsets, useStageValues){
121 var i, 122 var i,
122 documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true), 123 documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
123 stage = this.application.ninja.stage, 124 stage = this.application.ninja.stage,
@@ -141,6 +142,13 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
141 t, 142 t,
142 plane, 143 plane,
143 elt; 144 elt;
145 if(useStageValues) {
146 initL = stage.userPaddingLeft;
147 initT = stage.userPaddingTop;
148 minLeft = stage.templateLeft;
149 minTop = stage.templateTop;
150 this._recalculateScrollOffsets = false;
151 }
144 for(i=0; i<len; i++) { 152 for(i=0; i<len; i++) {
145 elt = documentRootChildren[i]; 153 elt = documentRootChildren[i];
146 plane = this.addElement(elt); 154 plane = this.addElement(elt);
@@ -149,17 +157,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
149 t = plane._rect.m_top - docTop; 157 t = plane._rect.m_top - docTop;
150 if(l < minLeft) { 158 if(l < minLeft) {
151 minLeft = l; 159 minLeft = l;
160 stage.minLeftElement = elt;
152 } 161 }
153 if(t < minTop) { 162 if(t < minTop) {
154 minTop = t; 163 minTop = t;
164 stage.minTopElement = elt;
155 } 165 }
156 } 166 }
157 } 167 }
158 if(minLeft !== initL) { 168 if(minLeft !== initL) {
159 stage.userPaddingLeft = minLeft; 169 stage.userPaddingLeft = (minLeft < 0) ? minLeft : 0;
160 } 170 }
161 if(minTop !== initT) { 171 if(minTop !== initT) {
162 stage.userPaddingTop = minTop; 172 stage.userPaddingTop = (minTop < 0) ? minTop : 0;
163 } 173 }
164 } 174 }
165 } 175 }
@@ -274,9 +284,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
274 t, 284 t,
275 plane, 285 plane,
276 changed = false, 286 changed = false,
287 elt,
277 adjustStagePadding = !isChanging || (event.detail.data.prop !== "matrix"); 288 adjustStagePadding = !isChanging || (event.detail.data.prop !== "matrix");
278 for(var i=0; i < len; i++) { 289 for(var i=0; i < len; i++) {
279 plane = els[i].elementModel.props3D.elementPlane; 290 elt = els[i];
291 plane = elt.elementModel.props3D.elementPlane;
280 if(plane) { 292 if(plane) {
281 plane.init(); 293 plane.init();
282 if(adjustStagePadding) { 294 if(adjustStagePadding) {
@@ -284,22 +296,34 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
284 t = plane._rect.m_top - docTop; 296 t = plane._rect.m_top - docTop;
285 if(l < minLeft) { 297 if(l < minLeft) {
286 minLeft = l; 298 minLeft = l;
299 stage.minLeftElement = elt;
300 } else if((elt === stage.minLeftElement) && (l > minLeft)) {
301 this._recalculateScrollOffsets = true;
287 } 302 }
303
288 if(t < minTop) { 304 if(t < minTop) {
289 minTop = t; 305 minTop = t;
306 stage.minTopElement = elt;
307 } else if((elt === stage.minTopElement) && (t > minTop)) {
308 this._recalculateScrollOffsets = true;
290 } 309 }
291 } 310 }
292 } 311 }
293 } 312 }
294 313
295 if(adjustStagePadding) { 314 if(adjustStagePadding) {
296 if(minLeft !== stage.userPaddingLeft) { 315 if(this._recalculateScrollOffsets && !isChanging) {
297 stage.userPaddingLeft = minLeft; 316 this.initializeFromDocument(true, true);
298 changed = true;
299 }
300 if(minTop !== stage.userPaddingTop) {
301 stage.userPaddingTop = minTop;
302 changed = true; 317 changed = true;
318 } else {
319 if(minLeft !== stage.userPaddingLeft) {
320 stage.userPaddingLeft = minLeft;
321 changed = true;
322 }
323 if(minTop !== stage.userPaddingTop) {
324 stage.userPaddingTop = minTop;
325 changed = true;
326 }
303 } 327 }
304 } 328 }
305 329
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index f4de3070..5e913c76 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -249,6 +249,10 @@ exports.Stage = Montage.create(Component, {
249 this.currentDocument.model.documentOffsetTop = this._documentOffsetTop; 249 this.currentDocument.model.documentOffsetTop = this._documentOffsetTop;
250 this.currentDocument.model.userContentLeft = this._userContentLeft; 250 this.currentDocument.model.userContentLeft = this._userContentLeft;
251 this.currentDocument.model.userContentTop = this._userContentTop; 251 this.currentDocument.model.userContentTop = this._userContentTop;
252 this.currentDocument.model.templateLeft = this.templateLeft;
253 this.currentDocument.model.templateTop = this.templateTop;
254 this.currentDocument.model.minLeftElement = this.minLeftElement;
255 this.currentDocument.model.minTopElement = this.minTopElement;
252 256
253 //call configure false with the old document on the selected tool to tear down down any temp. stuff 257 //call configure false with the old document on the selected tool to tear down down any temp. stuff
254 this.application.ninja.toolsData.selectedToolInstance._configure(false); 258 this.application.ninja.toolsData.selectedToolInstance._configure(false);
@@ -279,6 +283,13 @@ exports.Stage = Montage.create(Component, {
279 _userPaddingLeft: { value: 0 }, 283 _userPaddingLeft: { value: 0 },
280 _userPaddingTop: { value: 0 }, 284 _userPaddingTop: { value: 0 },
281 285
286 templateLeft: { value: 0 },
287 templateTop: { value: 0 },
288
289 // keep track of the elements that determine the minimum left and top scrollable amount
290 minLeftElement: { value: null },
291 minTopElement: { value: null },
292
282 userPaddingLeft: { 293 userPaddingLeft: {
283 get: function() { return this._userPaddingLeft; }, 294 get: function() { return this._userPaddingLeft; },
284 set: function(value) { 295 set: function(value) {
@@ -374,6 +385,10 @@ exports.Stage = Montage.create(Component, {
374 this._userContentTop = this.currentDocument.model.userContentTop; 385 this._userContentTop = this.currentDocument.model.userContentTop;
375 this._scrollLeft = this.currentDocument.model.scrollLeft; 386 this._scrollLeft = this.currentDocument.model.scrollLeft;
376 this._scrollTop = this.currentDocument.model.scrollTop; 387 this._scrollTop = this.currentDocument.model.scrollTop;
388 this.templateLeft = this.currentDocument.model.templateLeft;
389 this.templateTop = this.currentDocument.model.templateTop;
390 this.minLeftElement = this.currentDocument.model.minLeftElement;
391 this.minTopElement = this.currentDocument.model.minTopElement;
377 } else { 392 } else {
378 this._userPaddingLeft = 0; 393 this._userPaddingLeft = 0;
379 this._userPaddingTop = 0; 394 this._userPaddingTop = 0;
@@ -383,6 +398,10 @@ exports.Stage = Montage.create(Component, {
383 this._userContentTop = 0; 398 this._userContentTop = 0;
384 this._scrollLeft = 0; 399 this._scrollLeft = 0;
385 this._scrollTop = 0; 400 this._scrollTop = 0;
401 this.templateLeft = 0;
402 this.templateTop = 0;
403 this.minLeftElement = null;
404 this.minTopElement = null;
386 } 405 }
387 406
388 // Recalculate the canvas sizes because of splitter resizing 407 // Recalculate the canvas sizes because of splitter resizing
@@ -400,9 +419,11 @@ exports.Stage = Montage.create(Component, {
400 var initialTop = parseInt((this.canvas.height - designView._template.size.height)/2); 419 var initialTop = parseInt((this.canvas.height - designView._template.size.height)/2);
401 if(initialLeft > this.documentOffsetLeft) { 420 if(initialLeft > this.documentOffsetLeft) {
402 this.userPaddingLeft = -initialLeft; 421 this.userPaddingLeft = -initialLeft;
422 this.templateLeft = -initialLeft;
403 } 423 }
404 if(initialTop > this.documentOffsetTop) { 424 if(initialTop > this.documentOffsetTop) {
405 this.userPaddingTop = -initialTop; 425 this.userPaddingTop = -initialTop;
426 this.templateTop = -initialTop;
406 } 427 }
407 } 428 }
408 429