diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/layout/bread-crumb.reel | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/layout/bread-crumb.reel')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 11 | ||||
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 413f588d..7e14157e 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -13,8 +13,7 @@ | |||
| 13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
| 14 | { | 14 | { |
| 15 | "owner": { | 15 | "owner": { |
| 16 | "module": "js/components/layout/bread-crumb.reel", | 16 | "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]", |
| 17 | "name": "Breadcrumb", | ||
| 18 | "properties": { | 17 | "properties": { |
| 19 | "element": {"#": "breadcrumbTrail"}, | 18 | "element": {"#": "breadcrumbTrail"}, |
| 20 | "breadcrumbBt": {"@": "breadCrumbButton"} | 19 | "breadcrumbBt": {"@": "breadCrumbButton"} |
| @@ -22,8 +21,7 @@ | |||
| 22 | }, | 21 | }, |
| 23 | 22 | ||
| 24 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
| 25 | "module": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/button.reel", |
| 26 | "name": "Button", | ||
| 27 | "properties": { | 25 | "properties": { |
| 28 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
| 29 | }, | 27 | }, |
| @@ -48,8 +46,7 @@ | |||
| 48 | }, | 46 | }, |
| 49 | 47 | ||
| 50 | "repetition1": { | 48 | "repetition1": { |
| 51 | "module": "montage/ui/repetition.reel", | 49 | "prototype": "montage/ui/repetition.reel", |
| 52 | "name": "Repetition", | ||
| 53 | "properties": { | 50 | "properties": { |
| 54 | "element": {"#": "breadcrumb_container"} | 51 | "element": {"#": "breadcrumb_container"} |
| 55 | }, | 52 | }, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 597577f1..e396bdbf 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
| @@ -23,6 +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 | } | 27 | } |
| 27 | } | 28 | } |
| 28 | }, | 29 | }, |
| @@ -81,7 +82,6 @@ exports.Breadcrumb = Montage.create(Component, { | |||
| 81 | 82 | ||
| 82 | // This is always the top container which is now hardcoded to body | 83 | // This is always the top container which is now hardcoded to body |
| 83 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); | 84 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); |
| 84 | console.log("this works!"); | ||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | } | 87 | } |
| @@ -89,7 +89,6 @@ exports.Breadcrumb = Montage.create(Component, { | |||
| 89 | 89 | ||
| 90 | handleAction: { | 90 | handleAction: { |
| 91 | value: function(evt) { | 91 | value: function(evt) { |
| 92 | |||
| 93 | if(evt.target.value === this.container.uuid) { | 92 | if(evt.target.value === this.container.uuid) { |
| 94 | return; | 93 | return; |
| 95 | } | 94 | } |