aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-14 16:12:59 -0700
committerJose Antonio Marquez2012-06-14 16:12:59 -0700
commit358192a29533b34fa4938d59825f29bfd8d02b14 (patch)
treeab21c8b472aaec4cc85d46207a12b606ea8cffa4 /js/stage/stage.reel
parentaacfa86521c7d1c7159f1da1fad5bb2c638cc811 (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-358192a29533b34fa4938d59825f29bfd8d02b14.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-xjs/stage/stage.reel/stage.js42
1 files changed, 27 insertions, 15 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 129bcc33..fce73882 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -243,6 +243,13 @@ exports.Stage = Montage.create(Component, {
243 if(this.currentDocument && (this.currentDocument.currentView === "design")) { 243 if(this.currentDocument && (this.currentDocument.currentView === "design")) {
244 this.currentDocument.model.scrollLeft = this._scrollLeft; 244 this.currentDocument.model.scrollLeft = this._scrollLeft;
245 this.currentDocument.model.scrollTop = this._scrollTop; 245 this.currentDocument.model.scrollTop = this._scrollTop;
246 this.currentDocument.model.userPaddingLeft = this._userPaddingLeft;
247 this.currentDocument.model.userPaddingTop = this._userPaddingTop;
248 this.currentDocument.model.documentOffsetLeft = this._documentOffsetLeft;
249 this.currentDocument.model.documentOffsetTop = this._documentOffsetTop;
250 this.currentDocument.model.userContentLeft = this._userContentLeft;
251 this.currentDocument.model.userContentTop = this._userContentTop;
252
246 //call configure false with the old document on the selected tool to tear down down any temp. stuff 253 //call configure false with the old document on the selected tool to tear down down any temp. stuff
247 this.application.ninja.toolsData.selectedToolInstance._configure(false); 254 this.application.ninja.toolsData.selectedToolInstance._configure(false);
248 } 255 }
@@ -359,6 +366,23 @@ exports.Stage = Montage.create(Component, {
359 366
360 if(model.scrollLeft != null) { 367 if(model.scrollLeft != null) {
361 didSwitch = true; 368 didSwitch = true;
369 this._userPaddingLeft = this.currentDocument.model.userPaddingLeft;
370 this._userPaddingTop = this.currentDocument.model.userPaddingTop;
371 this._documentOffsetLeft = this.currentDocument.model.documentOffsetLeft;
372 this._documentOffsetTop = this.currentDocument.model.documentOffsetTop;
373 this._userContentLeft = this.currentDocument.model.userContentLeft;
374 this._userContentTop = this.currentDocument.model.userContentTop;
375 this._scrollLeft = this.currentDocument.model.scrollLeft;
376 this._scrollTop = this.currentDocument.model.scrollTop;
377 } else {
378 this._userPaddingLeft = 0;
379 this._userPaddingTop = 0;
380 this._documentOffsetLeft = 0;
381 this._documentOffsetTop = 0;
382 this._userContentLeft = 0;
383 this._userContentTop = 0;
384 this._scrollLeft = 0;
385 this._scrollTop = 0;
362 } 386 }
363 387
364 // Recalculate the canvas sizes because of splitter resizing 388 // Recalculate the canvas sizes because of splitter resizing
@@ -369,19 +393,7 @@ exports.Stage = Montage.create(Component, {
369 393
370 this.addPropertyChangeListener("appModel.show3dGrid", this, false); 394 this.addPropertyChangeListener("appModel.show3dGrid", this, false);
371 395
372 this._userPaddingLeft = 0; 396 this.initialize3DOnOpenDocument(!didSwitch);
373 this._userPaddingTop = 0;
374
375 this._documentOffsetLeft = 0;
376 this._documentOffsetTop = 0;
377
378 this._userContentLeft = 0;
379 this._userContentTop = 0;
380
381 this._scrollLeft = 0;
382 this._scrollTop = 0;
383
384 this.initialize3DOnOpenDocument();
385 397
386 if(designView._template) { 398 if(designView._template) {
387 var initialLeft = parseInt((this.canvas.width - designView._template.size.width)/2); 399 var initialLeft = parseInt((this.canvas.width - designView._template.size.width)/2);
@@ -1247,7 +1259,7 @@ exports.Stage = Montage.create(Component, {
1247 }, 1259 },
1248 1260
1249 initialize3DOnOpenDocument: { 1261 initialize3DOnOpenDocument: {
1250 value: function() { 1262 value: function(adjustScrollOffsets) {
1251 1263
1252 workingPlane = [0,0,1,0]; 1264 workingPlane = [0,0,1,0];
1253 1265
@@ -1258,7 +1270,7 @@ exports.Stage = Montage.create(Component, {
1258 this.snapManager.currentStage = this.currentDocument.model.documentRoot; 1270 this.snapManager.currentStage = this.currentDocument.model.documentRoot;
1259 this.snapManager.setupDragPlaneFromPlane (workingPlane); 1271 this.snapManager.setupDragPlaneFromPlane (workingPlane);
1260 1272
1261 this.drawUtils.initializeFromDocument(); 1273 this.drawUtils.initializeFromDocument(adjustScrollOffsets);
1262 } 1274 }
1263 } 1275 }
1264 1276