aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorJon Reid2012-04-19 14:30:38 -0700
committerJon Reid2012-04-19 14:30:38 -0700
commit71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0 (patch)
tree78292a128cd79f2aa7fbc7a7077dea83389a52e8 /js/tools/SelectionTool.js
parentfc22cd3b5c65dc6f137fbb59443e2061cbbcac26 (diff)
parent4465a66996f2b022ab9e838e028415fd87cfa405 (diff)
downloadninja-71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index abf45365..30e56b28 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -221,10 +221,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
221 HandleDoubleClick: { 221 HandleDoubleClick: {
222 value: function(event) { 222 value: function(event) {
223 if(this.application.ninja.selectedElements.length > 0) { 223 if(this.application.ninja.selectedElements.length > 0) {
224 this.application.ninja.breadCrumbClick = true; 224 this.application.ninja.currentDocument.breadCrumbClick = true;
225 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; 225 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
226 } else { 226 } else {
227 this.application.ninja.breadCrumbClick = true; 227 this.application.ninja.currentDocument.breadCrumbClick = true;
228 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; 228 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
229 } 229 }
230 } 230 }