diff options
| author | Jon Reid | 2012-03-15 15:01:15 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-03-15 15:01:15 -0700 |
| commit | 75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch) | |
| tree | f3a157f8cd92a8defb47edc68d8881db46f20586 /js/components | |
| parent | 21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff) | |
| parent | 68d82cb56cb0235599c46caf349f328f15300fdf (diff) | |
| download | ninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'js/components')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 3 |
1 files changed, 1 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 ab390fc6..f35972b6 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
| @@ -71,8 +71,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
| 71 | // This is always the top container which is now hardcoded to body | 71 | // This is always the top container which is now hardcoded to body |
| 72 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); | 72 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); |
| 73 | 73 | ||
| 74 | // This is for the timeline -- Disable it since the timeline should not know about this object | 74 | |
| 75 | // NJevent('layerBinding',{selected:false ,element:this.container}) | ||
| 76 | 75 | ||
| 77 | } | 76 | } |
| 78 | }, | 77 | }, |