From 31d73bccdda6145c6bbb5c25f6db3e139fcb9e6c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 23 Feb 2012 01:49:33 -0800 Subject: Enabling outline on open documents and parsing doom on open to create models. Signed-off-by: Valerio Virgillito --- js/stage/stage.reel/stage.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 44e14827..6536a45d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -258,6 +258,8 @@ exports.Stage = Montage.create(Component, { this.application.ninja.toolsData.selectedToolInstance._configure(true); this.addEventListener("change@appModel.show3dGrid", this, false); + + this.layout.handleOpenDocument(); } }, -- cgit v1.2.3 From 7283884c39df537694b21419a3ea9e3ca7793b4b Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 23 Feb 2012 13:43:35 -0800 Subject: switch html document - re-initialize draw-utils and snap-manager on opening a document and while switching documents Signed-off-by: Ananya Sen --- js/stage/stage.reel/stage.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 44e14827..6bb626c2 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -37,6 +37,10 @@ exports.Stage = Montage.create(Component, { get: function() { return this.stageDeps.snapManager; } }, + drawUtils: { + get: function() { return this.stageDeps.drawUtils; } + }, + resizeCanvases: { get: function() { return this._resizeCanvases; -- cgit v1.2.3 From 6e66f411ba02eaaeb33471115345ecf3c7ce4ce9 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 23 Feb 2012 17:55:59 -0800 Subject: refresh draw-utils, snap-manager, view-utils for html document stitching Signed-off-by: Ananya Sen --- js/stage/stage.reel/stage.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 755c7ff1..9784f14d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -148,12 +148,12 @@ exports.Stage = Montage.create(Component, { userContentLeft: { get: function() { return this._userContentLeft; }, - set: function(value) { this._userContentLeft = value; } + set: function(value) { this._userContentLeft = value;} }, userContentTop: { get: function() { return this._userContentTop; }, - set: function(value) { this._userContentTop = value; } + set: function(value) { this._userContentTop = value;} }, userContentBorder: { @@ -439,12 +439,11 @@ exports.Stage = Montage.create(Component, { */ handleScroll: { value: function() { - this._scrollLeft = this._iframeContainer.scrollLeft; this._scrollTop = this._iframeContainer.scrollTop; - this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; - this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; + this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; + this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; // Need to clear the snap cache and set up the drag plane //snapManager.setupDragPlaneFromPlane( workingPlane ); @@ -452,7 +451,6 @@ exports.Stage = Montage.create(Component, { this.needsDraw = true; this.layout.draw(); - //this._toolsList.action("DrawHandles"); } -- cgit v1.2.3