aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorKruti Shah2012-07-20 11:38:57 -0700
committerKruti Shah2012-07-20 11:38:57 -0700
commit4436c04c81e0f372b7e03416a2515630de8c72c6 (patch)
treeedfbd366df9d7e7514425561a817fc2c67f398d9 /js/tools
parent5741fbc0a2eb1a43017b76406056bc98cdf00297 (diff)
parent936fbd6d76d35e3f9574983682c266de6dce55f7 (diff)
downloadninja-4436c04c81e0f372b7e03416a2515630de8c72c6.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/Rotate3DToolBase.js1
-rwxr-xr-xjs/tools/SelectionTool.js2
-rwxr-xr-xjs/tools/Translate3DToolBase.js1
-rwxr-xr-xjs/tools/modifier-tool-base.js3
4 files changed, 0 insertions, 7 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index e36e23c4..545aedad 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -485,7 +485,6 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
485 if(len === 1) 485 if(len === 1)
486 { 486 {
487 this.target = this.application.ninja.selectedElements[0]; 487 this.target = this.application.ninja.selectedElements[0];
488 drawUtils.addElement(this.target);
489 488
490 viewUtils.pushViewportObj( this.target ); 489 viewUtils.pushViewportObj( this.target );
491 var eltCtr = viewUtils.getCenterOfProjection(); 490 var eltCtr = viewUtils.getCenterOfProjection();
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 923ed819..a136113b 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -102,7 +102,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
102 } 102 }
103 103
104 this.isDrawing = true; 104 this.isDrawing = true;
105 this.application.ninja.stage.showSelectionBounds = false;
106 105
107 this._use3DMode = false; 106 this._use3DMode = false;
108 107
@@ -183,7 +182,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
183 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); 182 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
184 183
185 this.isDrawing = false; 184 this.isDrawing = false;
186 this.application.ninja.stage.showSelectionBounds = true;
187 if(this._escape) { 185 if(this._escape) {
188 this._escape = false; 186 this._escape = false;
189 this._isSelecting = false; 187 this._isSelecting = false;
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 57a379e4..b5008666 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -302,7 +302,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
302 if(len) { 302 if(len) {
303 if(len === 1) { 303 if(len === 1) {
304 this.target = this.application.ninja.selectedElements[0]; 304 this.target = this.application.ninja.selectedElements[0];
305 drawUtils.addElement(this.target);
306 305
307 viewUtils.pushViewportObj( this.target ); 306 viewUtils.pushViewportObj( this.target );
308 var eltCtr = viewUtils.getCenterOfProjection(); 307 var eltCtr = viewUtils.getCenterOfProjection();
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 9b855e66..c772e36c 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -480,7 +480,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
480 if(this._target) 480 if(this._target)
481 { 481 {
482 this.isDrawing = true; 482 this.isDrawing = true;
483 this.application.ninja.stage.showSelectionBounds = false;
484 this._updateTargets(); 483 this._updateTargets();
485 484
486 if(this._canSnap) 485 if(this._canSnap)
@@ -798,7 +797,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
798 if(len === 1) 797 if(len === 1)
799 { 798 {
800 this.target = this.application.ninja.selectedElements[0]; 799 this.target = this.application.ninja.selectedElements[0];
801 drawUtils.addElement(this.target);
802 } 800 }
803 else 801 else
804 { 802 {
@@ -882,7 +880,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
882 new WebKitPoint(event.pageX, event.pageY)); 880 new WebKitPoint(event.pageX, event.pageY));
883 881
884 this.isDrawing = false; 882 this.isDrawing = false;
885 this.application.ninja.stage.showSelectionBounds = true;
886 if(this._escape) { 883 if(this._escape) {
887 this._escape = false; 884 this._escape = false;
888 return; 885 return;