diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/TimelinePanel.reel | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
4 files changed, 1276 insertions, 1272 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 57285704..07f9bb4f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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 |
@@ -29,10 +30,10 @@ 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> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> |
35 | 36 | ||
36 | 37 | ||
37 | <script type="text/montage-serialization"> | 38 | <script type="text/montage-serialization"> |
38 | { | 39 | { |
@@ -77,73 +78,73 @@ POSSIBILITY OF SUCH DAMAGE. | |||
77 | } | 78 | } |
78 | }, | 79 | }, |
79 | 80 | ||
80 | 81 | ||
81 | "repetition1": { | 82 | "repetition1": { |
82 | "prototype": "montage/ui/repetition.reel", | 83 | "prototype": "montage/ui/repetition.reel", |
83 | "properties": { | 84 | "properties": { |
84 | "element": {"#": "container-layers"}, | 85 | "element": {"#": "container-layers"}, |
85 | "isSelectionEnabled" : true | 86 | "isSelectionEnabled" : true |
86 | }, | 87 | }, |
87 | "bindings": { | 88 | "bindings": { |
88 | "objects": { | 89 | "objects": { |
89 | "boundObject": {"@": "owner"}, | 90 | "boundObject": {"@": "owner"}, |
90 | "boundObjectPropertyPath": "arrLayers", | 91 | "boundObjectPropertyPath": "arrLayers", |
91 | "oneway": false | 92 | "oneway": false |
92 | } | 93 | } |
93 | } | 94 | } |
94 | }, | 95 | }, |
95 | "layer" : { | 96 | "layer" : { |
96 | "prototype" : "js/panels/Timeline/Layer.reel", | 97 | "prototype" : "js/panels/Timeline/Layer.reel", |
97 | "properties" : { | 98 | "properties" : { |
98 | "element": {"#": "container-layer"} | 99 | "element": {"#": "container-layer"} |
99 | }, | 100 | }, |
100 | "bindings" : { | 101 | "bindings" : { |
101 | "layerData" : { | 102 | "layerData" : { |
102 | "boundObject" : {"@" : "repetition1"}, | 103 | "boundObject" : {"@" : "repetition1"}, |
103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 104 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
104 | "oneway" : false | 105 | "oneway" : false |
105 | }, | 106 | }, |
106 | "bindingPoint" : { | 107 | "bindingPoint" : { |
107 | "boundObject" : {"@" : "repetition1"}, | 108 | "boundObject" : {"@" : "repetition1"}, |
108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | 109 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", |
109 | "oneway" : false | 110 | "oneway" : false |
110 | } | 111 | } |
111 | } | 112 | } |
112 | }, | 113 | }, |
113 | 114 | ||
114 | "repetition2" : { | 115 | "repetition2" : { |
115 | "prototype": "montage/ui/repetition.reel", | 116 | "prototype": "montage/ui/repetition.reel", |
116 | "properties": { | 117 | "properties": { |
117 | "element": {"#": "container-tracks"}, | 118 | "element": {"#": "container-tracks"}, |
118 | "isSelectionEnabled" : false | 119 | "isSelectionEnabled" : false |
119 | }, | 120 | }, |
120 | "bindings": { | 121 | "bindings": { |
121 | "objects": { | 122 | "objects": { |
122 | "boundObject": {"@": "owner"}, | 123 | "boundObject": {"@": "owner"}, |
123 | "boundObjectPropertyPath": "arrLayers", | 124 | "boundObjectPropertyPath": "arrLayers", |
124 | "oneway": false | 125 | "oneway": false |
125 | } | 126 | } |
126 | } | 127 | } |
127 | }, | 128 | }, |
128 | "track" : { | 129 | "track" : { |
129 | "prototype" : "js/panels/Timeline/TimelineTrack.reel", | 130 | "prototype" : "js/panels/Timeline/TimelineTrack.reel", |
130 | "properties" : { | 131 | "properties" : { |
131 | "element": {"#": "container-track"} | 132 | "element": {"#": "container-track"} |
132 | }, | 133 | }, |
133 | "bindings" : { | 134 | "bindings" : { |
134 | "trackData" : { | 135 | "trackData" : { |
135 | "boundObject" : {"@" : "repetition2"}, | 136 | "boundObject" : {"@" : "repetition2"}, |
136 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 137 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
137 | "oneway" : false | 138 | "oneway" : false |
138 | }, | 139 | }, |
139 | "bindingPoint" : { | 140 | "bindingPoint" : { |
140 | "boundObject" : {"@" : "repetition2"}, | 141 | "boundObject" : {"@" : "repetition2"}, |
141 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | 142 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", |
142 | "oneway" : false | 143 | "oneway" : false |
143 | } | 144 | } |
144 | 145 | ||
145 | } | 146 | } |
146 | }, | 147 | }, |
147 | 148 | ||
148 | "timelineZoomSlider":{ | 149 | "timelineZoomSlider":{ |
149 | "prototype":"js/components/slider.reel", | 150 | "prototype":"js/components/slider.reel", |
@@ -163,22 +164,22 @@ POSSIBILITY OF SUCH DAMAGE. | |||
163 | 164 | ||
164 | "endHottext" : { | 165 | "endHottext" : { |
165 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 166 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
166 | "properties": { | 167 | "properties": { |
167 | "element": {"#": "end_hottext"}, | 168 | "element": {"#": "end_hottext"}, |
168 | "maxValue" : 100000, | 169 | "maxValue" : 100000, |
169 | "minValue" : 1, | 170 | "minValue" : 1, |
170 | "acceptableUnits" : "sec", | 171 | "acceptableUnits" : "sec", |
171 | "units" : "sec", | 172 | "units" : "sec", |