From 7ad96123fcc61f613c199faa3b98bff5d352ceee Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 14 May 2012 17:17:17 -0700 Subject: userContentLeft and userContentTop need to set scroll offsets for 0 also. Signed-off-by: Nivesh Rajbhandari --- js/stage/stage-deps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index a71b77be..33ba2359 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -52,7 +52,7 @@ exports.StageDeps = Montage.create(Component, { userContentLeft: { get: function() { return this._userContentLeft; }, set: function(value) { - if(value) { + if(value != null) { viewUtils.setUserContentLeft(value); } } @@ -65,7 +65,7 @@ exports.StageDeps = Montage.create(Component, { userContentTop: { get: function() { return this._userContentTop; }, set: function(value) { - if(value) { + if(value != null) { viewUtils.setUserContentTop(value); } } -- cgit v1.2.3 From 0ebb822b0535bf1bb100b3f3cb396c8b6d3383f1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 11:23:12 -0700 Subject: fixing some of the document bindings. Signed-off-by: Valerio Virgillito --- js/stage/stage-deps.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 33ba2359..1825eb06 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -95,12 +95,6 @@ exports.StageDeps = Montage.create(Component, { handleAppLoaded: { value: function() { - Object.defineBinding(this, "currentDocument", { - boundObject: this.application.ninja, - boundObjectPropertyPath: "currentDocument", - oneway: true - }); - Object.defineBinding(this, "userContentLeft", { boundObject: this.stage, boundObjectPropertyPath: "_userContentLeft", -- cgit v1.2.3 From b72c5f72ea5df4aa164350e1ba66fd1b4e23369d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 17 May 2012 23:07:48 -0700 Subject: removing all stageDeps for drawing classes. Signed-off-by: Valerio Virgillito --- js/stage/stage-deps.js | 61 +++++++------------------------------------------- 1 file changed, 8 insertions(+), 53 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 1825eb06..17039438 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -11,8 +11,7 @@ var Montage = require("montage/core/core").Montage, drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, - VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, - DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase; + VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; exports.StageDeps = Montage.create(Component, { viewUtils: { @@ -27,24 +26,6 @@ exports.StageDeps = Montage.create(Component, { value: drawUtils }, - currentStage: { - value: null - }, - - _currentDocument: { - value: null - }, - - currentDocument: { - get: function() { return this._currentDocument; }, - set: function(value) { - if(value) { - this._currentDocument = value; - this.currentStage = value.documentRoot; - } - } - }, - _userContentLeft: { value: null }, @@ -112,7 +93,9 @@ exports.StageDeps = Montage.create(Component, { // bind the snap properties to the snap manager snapManager.bindSnap(); - + drawUtils.viewUtils = viewUtils; + drawUtils.snapManager = snapManager; + drawUtils.ElementPlanes = ElementPlanes; } }, @@ -121,22 +104,8 @@ exports.StageDeps = Montage.create(Component, { workingPlane = [0,0,1,0]; - snapManager.setCurrentStage(this.currentStage); - - viewUtils.setCurrentDocument(this.currentDocument); - viewUtils.setRootElement(this.currentStage.parentNode); - viewUtils.setStageElement(this.currentStage); - - drawUtils.viewUtils = viewUtils; - drawUtils.snapManager = snapManager; - drawUtils.ElementPlanes = ElementPlanes; - - snapManager._isCacheInvalid=true; - - snapManager.setupDragPlaneFromPlane ( workingPlane ); - - DrawingToolBase.stage = this.currentStage; - DrawingToolBase.stageComponent = this.stage; + snapManager._isCacheInvalid = true; + snapManager.setupDragPlaneFromPlane (workingPlane); drawUtils.initializeFromDocument(); } @@ -147,22 +116,8 @@ exports.StageDeps = Montage.create(Component, { workingPlane = [0,0,1,0]; - snapManager.setCurrentStage(this.currentStage); - - viewUtils.setCurrentDocument(this.currentDocument); - viewUtils.setRootElement(this.currentStage.parentNode); - viewUtils.setStageElement(this.currentStage); - - drawUtils.viewUtils = viewUtils; - drawUtils.snapManager = snapManager; - drawUtils.ElementPlanes = ElementPlanes; - - snapManager._isCacheInvalid=true; - - snapManager.setupDragPlaneFromPlane ( workingPlane ); - - DrawingToolBase.stage = this.currentStage; - DrawingToolBase.stageComponent = this.stage; + snapManager._isCacheInvalid = true; + snapManager.setupDragPlaneFromPlane (workingPlane); drawUtils.initializeFromDocument(); } -- cgit v1.2.3 From 7a94696e19b14e15261df516e2ba75e693b1313d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 00:21:56 -0700 Subject: enabling basic document switching Signed-off-by: Valerio Virgillito --- js/stage/stage-deps.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 17039438..84f04249 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -55,8 +55,9 @@ exports.StageDeps = Montage.create(Component, { deserializedFromTemplate: { value: function() { - this.eventManager.addEventListener( "appLoaded", this, false); - this.eventManager.addEventListener( "openDocument", this, false); + this.eventManager.addEventListener("appLoaded", this, false); + this.eventManager.addEventListener("openDocument", this, false); + this.eventManager.addEventListener("switchDocument", this, false); // Initialize Deps // HACK @@ -111,9 +112,8 @@ exports.StageDeps = Montage.create(Component, { } }, - reinitializeForSwitchDocument: { - value: function() { - + handleSwitchDocument: { + value: function(){ workingPlane = [0,0,1,0]; snapManager._isCacheInvalid = true; @@ -122,7 +122,4 @@ exports.StageDeps = Montage.create(Component, { drawUtils.initializeFromDocument(); } } - - - }); \ No newline at end of file -- cgit v1.2.3 From 084bb924bc3c3a6ad1e2e21099399bba4d473fed Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 00:41:31 -0700 Subject: fixing some snapping bugs Signed-off-by: Valerio Virgillito --- js/stage/stage-deps.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 84f04249..0d53696b 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -105,7 +105,7 @@ exports.StageDeps = Montage.create(Component, { workingPlane = [0,0,1,0]; - snapManager._isCacheInvalid = true; + snapManager.reload2DCache(); snapManager.setupDragPlaneFromPlane (workingPlane); drawUtils.initializeFromDocument(); @@ -116,8 +116,9 @@ exports.StageDeps = Montage.create(Component, { value: function(){ workingPlane = [0,0,1,0]; - snapManager._isCacheInvalid = true; snapManager.setupDragPlaneFromPlane (workingPlane); + snapManager.reload2DCache(); + drawUtils.initializeFromDocument(); } -- cgit v1.2.3 From f97590388467b5a3316f6f155162fc293915fddc Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 23 May 2012 16:09:22 -0700 Subject: Fixed scrolling and centering stage code. Also, moved liveNodeList into the design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari --- js/stage/stage-deps.js | 50 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 0d53696b..d018b03b 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -26,38 +26,12 @@ exports.StageDeps = Montage.create(Component, { value: drawUtils }, - _userContentLeft: { - value: null - }, - - userContentLeft: { - get: function() { return this._userContentLeft; }, - set: function(value) { - if(value != null) { - viewUtils.setUserContentLeft(value); - } - } - }, - - _userContentTop: { - value: null - }, - - userContentTop: { - get: function() { return this._userContentTop; }, - set: function(value) { - if(value != null) { - viewUtils.setUserContentTop(value); - } - } - }, - deserializedFromTemplate: { value: function() { this.eventManager.addEventListener("appLoaded", this, false); - this.eventManager.addEventListener("openDocument", this, false); - this.eventManager.addEventListener("switchDocument", this, false); +// this.eventManager.addEventListener("openDocument", this, false); +// this.eventManager.addEventListener("switchDocument", this, false); // Initialize Deps // HACK @@ -76,19 +50,6 @@ exports.StageDeps = Montage.create(Component, { handleAppLoaded: { value: function() { - - Object.defineBinding(this, "userContentLeft", { - boundObject: this.stage, - boundObjectPropertyPath: "_userContentLeft", - oneway: true - }); - - Object.defineBinding(this, "userContentTop", { - boundObject: this.stage, - boundObjectPropertyPath: "_userContentTop", - oneway: true - }); - // Setup the snap manager pointer to the app model snapManager.appModel = this.application.ninja.appModel; // bind the snap properties to the snap manager @@ -105,7 +66,8 @@ exports.StageDeps = Montage.create(Component, { workingPlane = [0,0,1,0]; - snapManager.reload2DCache(); +// snapManager.reload2DCache(); + snapManager._isCacheInvalid = true; snapManager.setupDragPlaneFromPlane (workingPlane); drawUtils.initializeFromDocument(); @@ -116,9 +78,9 @@ exports.StageDeps = Montage.create(Component, { value: function(){ workingPlane = [0,0,1,0]; + snapManager._isCacheInvalid = true; snapManager.setupDragPlaneFromPlane (workingPlane); - snapManager.reload2DCache(); - +// snapManager.reload2DCache(); drawUtils.initializeFromDocument(); } -- cgit v1.2.3 From 209ec9524a987a8f8bc20c57e2a76ac55be15fd9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 24 May 2012 11:11:47 -0700 Subject: Fixed selection bug when switching/opening documents. Also, use saved scroll values when switching between documents. Signed-off-by: Nivesh Rajbhandari --- js/stage/stage-deps.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index d018b03b..64adc01c 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -30,8 +30,6 @@ exports.StageDeps = Montage.create(Component, { value: function() { this.eventManager.addEventListener("appLoaded", this, false); -// this.eventManager.addEventListener("openDocument", this, false); -// this.eventManager.addEventListener("switchDocument", this, false); // Initialize Deps // HACK -- cgit v1.2.3 From 1adc3b050728e393583f94eb2216db813d4a7293 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 24 May 2012 11:20:42 -0700 Subject: Removed unused variables and methods in stage-deps, layout design, and snap-manager. Signed-off-by: Nivesh Rajbhandari --- js/stage/stage-deps.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/stage/stage-deps.js') diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 64adc01c..896d4a5b 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js @@ -64,7 +64,6 @@ exports.StageDeps = Montage.create(Component, { workingPlane = [0,0,1,0]; -// snapManager.reload2DCache(); snapManager._isCacheInvalid = true; snapManager.setupDragPlaneFromPlane (workingPlane); @@ -78,7 +77,6 @@ exports.StageDeps = Montage.create(Component, { snapManager._isCacheInvalid = true; snapManager.setupDragPlaneFromPlane (workingPlane); -// snapManager.reload2DCache(); drawUtils.initializeFromDocument(); } -- cgit v1.2.3