diff options
| author | Valerio Virgillito | 2012-07-09 14:20:43 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:20:43 -0700 |
| commit | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (patch) | |
| tree | a071439dd80e8b9484379e5ffa84e28d831f4a7b /js/tools | |
| parent | 1bbba17e8605434356de0a477710d6a0136986fc (diff) | |
| parent | 1b3a5532573cbd412a98d33026a34554955c0f04 (diff) | |
| download | ninja-c0a42c56f768a873ba637f5b86d5f6a84d4a3312.tar.gz | |
Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internal
Conflicts:
js/components/tools-properties/text-properties.reel/text-properties.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools')
| -rwxr-xr-x | js/tools/TextTool.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js index 3649b11b..f15cd180 100755 --- a/js/tools/TextTool.js +++ b/js/tools/TextTool.js | |||
| @@ -192,7 +192,6 @@ exports.TextTool = Montage.create(DrawingTool, { | |||
| 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; |