diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index ae3e2022..0dabc781 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -32,30 +32,23 @@ | |||
| 32 | } | 32 | } |
| 33 | ], | 33 | ], |
| 34 | "bindings": { | 34 | "bindings": { |
| 35 | "label": { | 35 | "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"}, |
| 36 | "boundObject": {"@": "repetition1"}, | 36 | "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"} |
| 37 | "boundObjectPropertyPath": "objectAtCurrentIteration.label", | 37 | } |
| 38 | "oneway": true | 38 | }, |
| 39 | }, | 39 | |
| 40 | "value": { | 40 | "buttonsListController": { |
| 41 | "boundObject": {"@": "repetition1"}, | 41 | "prototype": "montage/ui/controller/array-controller", |
| 42 | "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid", | 42 | "bindings": { |
| 43 | "oneway": true | 43 | "content": {"<<->": "@owner.containerElements"} |
| 44 | } | ||
| 45 | } | 44 | } |
| 46 | }, | 45 | }, |
| 47 | 46 | ||
| 48 | "repetition1": { | 47 | "buttonsList": { |
| 49 | "prototype": "montage/ui/repetition.reel", | 48 | "prototype": "montage/ui/repetition.reel", |
| 50 | "properties": { | 49 | "properties": { |
| 51 | "element": {"#": "breadcrumb_container"} | 50 | "element": {"#": "breadcrumb_container"}, |
| 52 | }, | 51 | "contentController": {"@": "buttonsListController"} |
| 53 | "bindings": { | ||
| 54 | "objects": { | ||
| 55 | "boundObject": {"@": "owner"}, | ||
| 56 | "boundObjectPropertyPath": "containerElements", | ||
| 57 | "oneway": true | ||
| 58 | } | ||
| 59 | } | 52 | } |
| 60 | }, | 53 | }, |
| 61 | 54 | ||
| @@ -65,11 +58,7 @@ | |||
| 65 | "element": {"#": "disabledCondition"} | 58 | "element": {"#": "disabledCondition"} |
| 66 | }, | 59 | }, |
| 67 | "bindings": { | 60 | "bindings": { |
| 68 | "condition": { | 61 | "condition": {"<-": "@owner.disabled"} |
| 69 | "boundObject": {"@": "owner"}, | ||
| 70 | "boundObjectPropertyPath": "disabled", | ||
| 71 | "oneway": true | ||
| 72 | } | ||
| 73 | } | 62 | } |
| 74 | } | 63 | } |
| 75 | } | 64 | } |