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 ++++++------------------------------------ js/stage/stage.reel/stage.html | 3 --- 2 files changed, 8 insertions(+), 56 deletions(-) (limited to 'js/stage') 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(); } diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 88cd6149..30c3d231 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html @@ -22,9 +22,6 @@ "prototype": "js/stage/stage-deps", "properties": { "stage": {"@": "owner"} - }, - "bindings": { - "currentDocument": {"<-": "@owner.activeDocument"} } }, -- cgit v1.2.3