aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RotateStage3DTool.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /js/tools/RotateStage3DTool.js
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
-rwxr-xr-xjs/tools/RotateStage3DTool.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 12b21a64..9e117837 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -85,6 +85,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
85 } 85 }
86 }, 86 },
87 87
88 captureSelectionChange: {
89 value: function(event){
90 this.eventManager.addEventListener("selectionDrawn", this, true);
91 }
92 },
93
88 captureSelectionDrawn: { 94 captureSelectionDrawn: {
89 value: function(event){ 95 value: function(event){
90 this._origin = null; 96 this._origin = null;
@@ -114,6 +120,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
114 this._origin = viewUtils.localToGlobal(eltCtr, stage); 120 this._origin = viewUtils.localToGlobal(eltCtr, stage);
115 this._setTransformOrigin(false); 121 this._setTransformOrigin(false);
116 this.DrawHandles(); 122 this.DrawHandles();
123
124 if(event)
125 {
126 this.eventManager.removeEventListener("selectionDrawn", this, true);
127 }
117 } 128 }
118 }, 129 },
119 130