diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/TimelinePanel.reel | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
3 files changed, 1228 insertions, 1228 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 57285704..9bada2fd 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 30 | </copyright> --> |
31 | <html lang="en"> | 31 | <html lang="en"> |
32 | <head> | 32 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> | 34 | <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> |
35 | 35 | ||
36 | 36 | ||
37 | <script type="text/montage-serialization"> | 37 | <script type="text/montage-serialization"> |
38 | { | 38 | { |
@@ -77,73 +77,73 @@ POSSIBILITY OF SUCH DAMAGE. | |||
77 | } | 77 | } |
78 | }, | 78 | }, |
79 | 79 | ||
80 | 80 | ||
81 | "repetition1": { | 81 | "repetition1": { |
82 | "prototype": "montage/ui/repetition.reel", | 82 | "prototype": "montage/ui/repetition.reel", |
83 | "properties": { | 83 | "properties": { |
84 | "element": {"#": "container-layers"}, | 84 | "element": {"#": "container-layers"}, |
85 | "isSelectionEnabled" : true | 85 | "isSelectionEnabled" : true |
86 | }, | 86 | }, |
87 | "bindings": { | 87 | "bindings": { |
88 | "objects": { | 88 | "objects": { |
89 | "boundObject": {"@": "owner"}, | 89 | "boundObject": {"@": "owner"}, |
90 | "boundObjectPropertyPath": "arrLayers", | 90 | "boundObjectPropertyPath": "arrLayers", |
91 | "oneway": false | 91 | "oneway": false |
92 | } | 92 | } |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | "layer" : { | 95 | "layer" : { |
96 | "prototype" : "js/panels/Timeline/Layer.reel", | 96 | "prototype" : "js/panels/Timeline/Layer.reel", |
97 | "properties" : { | 97 | "properties" : { |
98 | "element": {"#": "container-layer"} | 98 | "element": {"#": "container-layer"} |
99 | }, | 99 | }, |
100 | "bindings" : { | 100 | "bindings" : { |
101 | "layerData" : { | 101 | "layerData" : { |
102 | "boundObject" : {"@" : "repetition1"}, | 102 | "boundObject" : {"@" : "repetition1"}, |
103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
104 | "oneway" : false | 104 | "oneway" : false |
105 | }, | 105 | }, |
106 | "bindingPoint" : { | 106 | "bindingPoint" : { |
107 | "boundObject" : {"@" : "repetition1"}, | 107 | "boundObject" : {"@" : "repetition1"}, |
108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | 108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", |
109 | "oneway" : false | 109 | "oneway" : false |
110 | } | 110 | } |
111 | } | 111 | } |
112 | }, | 112 | }, |
113 | 113 | ||
114 | "repetition2" : { | 114 | "repetition2" : { |
115 | "prototype": "montage/ui/repetition.reel", | 115 | "prototype": "montage/ui/repetition.reel", |
116 | "properties": { | 116 | "properties": { |
117 | "element": {"#": "container-tracks"}, | 117 | "element": {"#": "container-tracks"}, |
118 | "isSelectionEnabled" : false | 118 | "isSelectionEnabled" : false |
119 | }, | 119 | }, |
120 | "bindings": { | 120 | "bindings": { |
121 | "objects": { | 121 | "objects": { |
122 | "boundObject": {"@": "owner"}, | 122 | "boundObject": {"@": "owner"}, |
123 | "boundObjectPropertyPath": "arrLayers", | 123 | "boundObjectPropertyPath": "arrLayers", |
124 | "oneway": false | 124 | "oneway": false |
125 | } | 125 | } |
126 | } | 126 | } |
127 | }, | 127 | }, |
128 | "track" : { | 128 | "track" : { |
129 | "prototype" : "js/panels/Timeline/TimelineTrack.reel", | 129 | "prototype" : "js/panels/Timeline/TimelineTrack.reel", |
130 | "properties" : { | 130 | "properties" : { |
131 | "element": {"#": "container-track"} | 131 | "element": {"#": "container-track"} |
132 | }, | 132 | }, |
133 | "bindings" : { | 133 | "bindings" : { |
134 | "trackData" : { | 134 | "trackData" : { |
135 | "boundObject" : {"@" : "repetition2"}, | 135 | "boundObject" : {"@" : "repetition2"}, |
136 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 136 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
137 | "oneway" : false | 137 | "oneway" : false |
138 | }, | 138 | }, |
139 | "bindingPoint" : { | 139 | "bindingPoint" : { |
140 | "boundObject" : {"@" : "repetition2"}, | 140 | "boundObject" : {"@" : "repetition2"}, |
141 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | 141 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", |
142 | "oneway" : false | 142 | "oneway" : false |
143 | } | 143 | } |
144 | 144 | ||
145 | } | 145 | } |
146 | }, | 146 | }, |
147 | 147 | ||
148 | "timelineZoomSlider":{ | 148 | "timelineZoomSlider":{ |
149 | "prototype":"js/components/slider.reel", | 149 | "prototype":"js/components/slider.reel", |
@@ -163,22 +163,22 @@ POSSIBILITY OF SUCH DAMAGE. | |||
163 | 163 | ||
164 | "endHottext" : { | 164 | "endHottext" : { |
165 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 165 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
166 | "properties": { | 166 | "properties": { |
167 | "element": {"#": "end_hottext"}, | 167 | "element": {"#": "end_hottext"}, |
168 | "maxValue" : 100000, | 168 | "maxValue" : 100000, |
169 | "minValue" : 1, | 169 | "minValue" : 1, |
170 | "acceptableUnits" : "sec", | 170 | "acceptableUnits" : "sec", |
171 | "units" : "sec", | 171 | "units" : "sec", |
172 | "value" : 25 | 172 | "value" : 25 |
173 | } | 173 | } |
174 | } | 174 | } |
175 | } | 175 | } |
176 | </script> | 176 | </script> |
177 | 177 | ||
178 | </head> | 178 | </head> |
179 | <body> | 179 | <body> |
180 | 180 | ||
181 | <div data-montage-id="timeline_panel" class="tl_container"> | 181 | <div data-montage-id="timeline_panel" class="tl_container"> |
182 | 182 | ||
183 | <div data-montage-id="bread_crumb"></div> | 183 | <div data-montage-id="bread_crumb"></div> |
184 | 184 | ||
@@ -195,23 +195,23 @@ POSSIBILITY OF SUCH DAMAGE. | |||
195 | </div> | 195 | </div> |
196 | 196 | ||
197 | 197 | ||
198 | 198 | ||
199 | <div data-montage-id="user_layers" class="userlayers"> | 199 | <div data-montage-id="user_layers" class="userlayers"> |
200 | <div data-montage-id="master_layer" class="masterlayer"> | 200 | <div data-montage-id="master_layer" class="masterlayer"> |
201 | <div class="layer-master">Master Layer | 201 | <div class="layer-master">Master Layer |
202 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> | 202 | <div class="tl-configbutton" data-montage-i |