diff options
author | Jon Reid | 2012-04-19 14:30:38 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-19 14:30:38 -0700 |
commit | 71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0 (patch) | |
tree | 78292a128cd79f2aa7fbc7a7077dea83389a52e8 /js/components | |
parent | fc22cd3b5c65dc6f137fbb59443e2061cbbcac26 (diff) | |
parent | 4465a66996f2b022ab9e838e028415fd87cfa405 (diff) | |
download | ninja-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/components')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 4776265a..faf5e2f8 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -71,7 +71,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
71 | 71 | ||
72 | // This is always the top container which is now hardcoded to body | 72 | // This is always the top container which is now hardcoded to body |
73 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); | 73 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); |
74 | 74 | NJevent("breadCrumbBinding",this) | |
75 | 75 | ||
76 | 76 | ||
77 | } | 77 | } |
@@ -80,7 +80,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
80 | handleAction: { | 80 | handleAction: { |
81 | value: function(evt) { | 81 | value: function(evt) { |
82 | 82 | ||
83 | this.application.ninja.breadCrumbClick=true; | 83 | this.application.ninja.currentDocument.breadCrumbClick=true; |
84 | if(evt.target.value === this.container.uuid) { | 84 | if(evt.target.value === this.container.uuid) { |
85 | return; | 85 | return; |
86 | } | 86 | } |