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/document-bar.reel/document-bar.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/document-bar.reel/document-bar.html')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 147 |
1 files changed, 88 insertions, 59 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index 945ab689..69f8107f 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.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 |
@@ -28,62 +29,90 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
32 | |||
31 | <html> | 33 | <html> |
32 | 34 | ||
33 | <head> | 35 | <head> |
34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 36 | |
35 | <link rel="stylesheet" type="text/css" href="document-bar.css"> | 37 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
38 | |||
39 | <link rel="stylesheet" type="text/css" href="document-bar.css"> | ||
36 | 40 | ||
37 | <script type="text/montage-serialization"> | 41 | <script type="text/montage-serialization"> |
38 | { | 42 | { |
39 | "hottext1": { | 43 | "hottext1": { |
40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 44 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
41 | "properties": { | 45 | "properties": { |
42 | "element": {"#": "zoomControlHT"}, | 46 | "element": {"#": "zoomControlHT"}, |
43 | "minValue":25, | 47 | "minValue":25, |
44 | "maxValue" :2000, | 48 | "maxValue" :2000, |
45 | "stepSize" :5, | 49 | "stepSize" :5, |
46 | "acceptableUnits" : ["%"], | 50 | "acceptableUnits" : ["%"], |
47 | "units" : "%" | 51 | "units" : "%" |
52 | }, | ||
53 | "bindings": { | ||
54 | "value": { | ||
55 | "boundObject": {"@": "owner"}, | ||
56 | "boundObjectPropertyPath": "zoomFactor", | ||
57 | "oneway": false | ||
58 | } | ||
59 | } | ||
48 | }, | 60 | }, |
49 | "bindings": { | 61 | |
50 | "value": { | 62 | "disable": { |
51 | "boundObject": {"@": "owner"}, | 63 | "prototype": "montage/ui/condition.reel", |
52 | "boundObjectPropertyPath": "zoomFactor", | 64 | "properties": { |
53 | "oneway": false | 65 | "element": {"#": "disabledCondition"} |
66 | }, | ||
67 | "bindings": { | ||
68 | "condition": {"<-": "@owner.disabled"} | ||
54 | } | 69 | } |
55 | } | ||
56 | }, | ||
57 | |||
58 | "disable": { | ||
59 | "prototype": "montage/ui/condition.reel", | ||
60 | "properties": { | ||
61 | "element": {"#": "disabledCondition"} | ||
62 | }, | 70 | }, |
63 | "bindings": { | 71 | |
64 | "condition": {"<-": "@owner.disabled"} | 72 | "owner": { |
65 | } | 73 | "prototype": "js/components/layout/document-bar.reel", |
66 | }, | 74 | "properties": { |
67 | 75 | "element": {"#": "documentBar"}, | |
68 | "owner": { | 76 | "zoomControl": {"@": "hottext1"} |
69 | "prototype": "js/components/layout/document-bar.reel", | 77 | } |
70 | "properties": { | ||
71 | "element": {"#": "documentBar"}, | ||
72 | "zoomControl": {"@": "hottext1"} | ||
73 | } | 78 | } |
74 | } | 79 | } |
75 | } | 80 | </script> |
76 | </script> | ||
77 | |||
78 | 81 | ||
79 | </head> | 82 | </head> |
80 | 83 | ||
81 | <body> | 84 | <body> |
82 | <div data-montage-id="documentBar"> | 85 | |
83 | <input class="zoomHotText label" data-montage-id="zoomControlHT"/> | 86 | <div data-montage-id="documentBar"> |
84 | <span class="design-view disable" data-montage-id="design">Design View</span> | 87 | |
85 | <span class="code-view disable" data-montage-id="code">Code View</span> | 88 | <section> |
86 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 89 | |
87 | </div> | 90 | <div class="zoomicon"></div> |
88 | </body> | 91 | |
92 | <input data-montage-id="zoomControlHT" class="zoomHotText label" /> | ||
93 | |||
94 | </section> | ||
95 | |||
96 | <section> | ||
97 | |||
98 | <div class="viewicon viewdesign"></div> | ||
99 | |||
100 | <button class="btn_view">Design</button> | ||
101 | |||
102 | </section> | ||
103 | |||
104 | <section class="inactive"> | ||
105 | |||
106 | <div class="viewicon viewcode"></div> | ||
107 | |||
108 | <button class="btn_view">Code</button> | ||
109 | |||
110 | </section> | ||
111 | |||
112 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | ||
113 | |||
114 | </div> | ||
115 | |||
116 | </body> | ||
117 | |||
89 | </html> | 118 | </html> |