diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/tools/SelectionTool.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-x | js/tools/SelectionTool.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index ed92b893..8b644d4a 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -224,10 +224,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
224 | HandleDoubleClick: { | 224 | HandleDoubleClick: { |
225 | value: function(event) { | 225 | value: function(event) { |
226 | if(this.application.ninja.selectedElements.length > 0) { | 226 | if(this.application.ninja.selectedElements.length > 0) { |
227 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; | 227 | this.application.ninja.currentDocument.model.domContainer = this.application.ninja.selectedElements[0]; |
228 | } else { | 228 | } else { |
229 | this.application.ninja.currentSelectedContainer = 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 | ||