aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
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/SelectionTool.js
parent5741fbc0a2eb1a43017b76406056bc98cdf00297 (diff)
parent936fbd6d76d35e3f9574983682c266de6dce55f7 (diff)
downloadninja-4436c04c81e0f372b7e03416a2515630de8c72c6.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js2
1 files changed, 0 insertions, 2 deletions
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;