diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/layout/bread-crumb.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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 | }, |