diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/tools/TextTool.js | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/tools/TextTool.js')
-rwxr-xr-x | js/tools/TextTool.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js index 3649b11b..2dbd90f3 100755 --- a/js/tools/TextTool.js +++ b/js/tools/TextTool.js | |||
@@ -189,10 +189,9 @@ exports.TextTool = Montage.create(DrawingTool, { | |||
189 | 189 | ||
190 | Configure: { | 190 | Configure: { |
191 | value: function(wasSelected) { | 191 | value: function(wasSelected) { |
192 | 192 | ||
193 | if(wasSelected) { | 193 | if(wasSelected) { |
194 | NJevent("enableStageMove"); | 194 | NJevent("enableStageMove"); |
195 | this.options.defineInitialProperties(); | ||
196 | this.application.ninja.stage.stageDeps.snapManager.setupDragPlaneFromPlane( workingPlane ); | 195 | this.application.ninja.stage.stageDeps.snapManager.setupDragPlaneFromPlane( workingPlane ); |
197 | } else { | 196 | } else { |
198 | this.selectedElement = null; | 197 | this.selectedElement = null; |