diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/tools | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools')
| -rwxr-xr-x | js/tools/SelectionTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 493f4aa2..8b644d4a 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
| @@ -228,6 +228,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
| 228 | } else { | 228 | } else { |
| 229 | this.application.ninja.currentDocument.model.domContainer = this.application.ninja.currentDocument.model.documentRoot; | 229 | this.application.ninja.currentDocument.model.domContainer = this.application.ninja.currentDocument.model.documentRoot; |
| 230 | } | 230 | } |
| 231 | this.application.ninja.selectionController.executeSelectElement(); | ||
| 231 | } | 232 | } |
| 232 | }, | 233 | }, |
| 233 | 234 | ||