diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/components/layout/bread-crumb.reel/bread-crumb.html | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.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 | 42 |
1 files changed, 18 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 02105616..2c6d941f 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -39,22 +40,15 @@ POSSIBILITY OF SUCH DAMAGE. | |||
39 | "owner": { | 40 | "owner": { |
40 | "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]", | 41 | "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]", |
41 | "properties": { | 42 | "properties": { |
42 | "element": {"#": "breadcrumbTrail"}, | 43 | "element": {"#": "breadcrumbTrail"} |
43 | "breadcrumbBt": {"@": "breadCrumbButton"} | ||
44 | } | 44 | } |
45 | }, | 45 | }, |
46 | 46 | ||
47 | "breadCrumbButton": { | 47 | "breadcrumbButton": { |
48 | "prototype": "montage/ui/native/button.reel", | 48 | "prototype": "js/components/layout/bread-crumb-button.reel", |
49 | "properties": { | 49 | "properties": { |
50 | "element": {"#": "breadcrumb_button"} | 50 | "element": {"#": "breadcrumbButton"} |
51 | }, | 51 | }, |
52 | "listeners": [ | ||
53 | { | ||
54 | "type": "action", | ||
55 | "listener": {"@": "owner"} | ||
56 | } | ||
57 | ], | ||
58 | "bindings": { | 52 | "bindings": { |
59 | "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"}, | 53 | "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"}, |
60 | "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"} | 54 | "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"} |
@@ -93,10 +87,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
93 | 87 | ||
94 | <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail"> | 88 | <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail"> |
95 | <div data-montage-id="breadcrumb_container"> | 89 | <div data-montage-id="breadcrumb_container"> |
96 | <button data-montage-id="breadcrumb_button" class="nj-skinned"></button> | 90 | <div data-montage-id="breadcrumbButton"></div> |
97 | </div> | 91 | </div> |
98 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 92 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
99 | </section> | 93 | </section> |
100 | 94 | ||
101 | </body> | 95 | </body> |
102 | </html> | 96 | </html> |