diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/layout/bread-crumb.reel | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/layout/bread-crumb.reel')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 8 | ||||
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 7e14157e..ae3e2022 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -78,11 +78,11 @@ | |||
| 78 | </head> | 78 | </head> |
| 79 | <body> | 79 | <body> |
| 80 | 80 | ||
| 81 | <section id="breadcrumbTrail" class="breadcrumbTrail"> | 81 | <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail"> |
| 82 | <div id="breadcrumb_container"> | 82 | <div data-montage-id="breadcrumb_container"> |
| 83 | <button id="breadcrumb_button" class="nj-skinned"></button> | 83 | <button data-montage-id="breadcrumb_button" class="nj-skinned"></button> |
| 84 | </div> | 84 | </div> |
| 85 | <div id="disabledCondition" class="panelDisabled"></div> | 85 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 86 | </section> | 86 | </section> |
| 87 | 87 | ||
| 88 | </body> | 88 | </body> |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index e396bdbf..c1b021a3 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
| @@ -23,7 +23,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
| 23 | value: function(){ | 23 | value: function(){ |
| 24 | if(!this.application.ninja.documentController.activeDocument) { | 24 | if(!this.application.ninja.documentController.activeDocument) { |
| 25 | this.disabled = true; | 25 | this.disabled = true; |
| 26 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | 26 | this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null); |
| 27 | } | 27 | } |
| 28 | } | 28 | } |
| 29 | }, | 29 | }, |