diff options
| author | Eric Guzman | 2012-03-14 10:58:02 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-14 10:58:02 -0700 |
| commit | 562e6d71d8bbe149f856b126e4c4246fc2d843ef (patch) | |
| tree | f4f4f551003807d5344a93ebcad88f99d2c15444 /js/components | |
| parent | 9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (diff) | |
| parent | 6df430d86c289413fea48f8e2ac37def72fbde46 (diff) | |
| download | ninja-562e6d71d8bbe149f856b126e4c4246fc2d843ef.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | }, |