diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@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 | 81 |
1 files changed, 44 insertions, 37 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index c1b9ed61..f2368e9a 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -16,55 +16,62 @@ | |||
| 16 | "module": "js/components/layout/bread-crumb.reel", | 16 | "module": "js/components/layout/bread-crumb.reel", |
| 17 | "name": "Breadcrumb", | 17 | "name": "Breadcrumb", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "breadcrumb_trail"}, | 19 | "element": {"#": "breadcrumbTrail"}, |
| 20 | "button" : {"@":"breadCrumbButton"}, | 20 | "breadcrumbBt": {"@": "breadCrumbButton"} |
| 21 | "stylerepetition" : {"@":"repetition1"} | ||
| 22 | |||
| 23 | } | 21 | } |
| 24 | }, | 22 | }, |
| 25 | 23 | ||
| 26 | "breadCrumbButton": { | 24 | "breadCrumbButton": { |
| 27 | "module": "js/components/layout/bread-crumb-button.reel", | 25 | "module": "montage/ui/button.reel", |
| 28 | "name": "BreadcrumbButton", | 26 | "name": "Button", |
| 29 | "properties": { | 27 | "properties": { |
| 30 | "element": {"#": "breadcrumb_button"} | 28 | "element": {"#": "breadcrumb_button"} |
| 31 | }, | 29 | }, |
| 32 | "bindings": { | 30 | "listeners": [ |
| 33 | "data": { | 31 | { |
| 34 | "boundObject": {"@": "repetition1"}, | 32 | "type": "action", |
| 35 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 33 | "listener": {"@": "owner"} |
| 36 | "oneway": true | 34 | } |
| 37 | } | 35 | ], |
| 38 | } | 36 | "bindings": { |
| 39 | }, | 37 | "label": { |
| 40 | 38 | "boundObject": {"@": "repetition1"}, | |
| 41 | "repetition1": { | 39 | "boundObjectPropertyPath": "objectAtCurrentIteration.label", |
| 42 | "module": "montage/ui/repetition.reel", | 40 | "oneway": true |
| 43 | "name": "Repetition", | 41 | }, |
| 44 | "properties": { | 42 | "value": { |
| 45 | "element": {"#": "breadcrumb_container"} | 43 | "boundObject": {"@": "repetition1"}, |
| 46 | }, | 44 | "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid", |
| 47 | "bindings": { | 45 | "oneway": true |
| 48 | "objects": { | 46 | } |
| 49 | "boundObject": {"@": "owner"}, | 47 | } |
| 50 | "boundObjectPropertyPath": "containerElements", | 48 | }, |
| 51 | "oneway": true | ||
| 52 | } | ||
| 53 | } | ||
| 54 | } | ||
| 55 | |||
| 56 | 49 | ||
| 50 | "repetition1": { | ||
| 51 | "module": "montage/ui/repetition.reel", | ||
| 52 | "name": "Repetition", | ||
| 53 | "properties": { | ||
| 54 | "element": {"#": "breadcrumb_container"} | ||
| 55 | }, | ||
| 56 | "bindings": { | ||
| 57 | "objects": { | ||
| 58 | "boundObject": {"@": "owner"}, | ||
| 59 | "boundObjectPropertyPath": "containerElements", | ||
| 60 | "oneway": true | ||
| 61 | } | ||
| 62 | } | ||
| 63 | } | ||
| 57 | } | 64 | } |
| 58 | </script> | 65 | </script> |
| 59 | 66 | ||
| 60 | </head> | 67 | </head> |
| 61 | <body> | 68 | <body> |
| 62 | 69 | ||
| 63 | <div id="breadcrumb_trail" class="breadcrumbtrail"> | 70 | <section id="breadcrumbTrail" class="breadcrumbTrail"> |
| 64 | <div id="breadcrumb_container" class="bread_crumb"> | 71 | <div id="breadcrumb_container"> |
| 65 | <div id="breadcrumb_button"></div> | 72 | <button id="breadcrumb_button" class="nj-skinned"></button> |
| 66 | </div> | 73 | </div> |
| 67 | </div> | 74 | </section> |
| 68 | 75 | ||
| 69 | </body> | 76 | </body> |
| 70 | </html> \ No newline at end of file | 77 | </html> \ No newline at end of file |