diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/components/layout | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/components/layout')
| -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 | }, |