diff options
author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 242 |
1 files changed, 223 insertions, 19 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 6849898b..29bf6eb3 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -1,32 +1,236 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | 2 | <html lang="en"> |
8 | <head> | 3 | <head> |
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
10 | <link rel="stylesheet" type="text/css" href="TimelinePanel.css"> | 5 | <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> |
6 | |||
7 | |||
11 | <script type="text/montage-serialization"> | 8 | <script type="text/montage-serialization"> |
12 | { | 9 | { |
13 | "owner": { | 10 | "owner": { |
14 | "module": "js/panels/Timeline/TimelinePanel.reel", | 11 | "module": "js/panels/Timeline/TimelinePanel.reel", |
15 | "name": "TimelinePanel", | 12 | "name": "TimelinePanel", |
16 | "properties": { | 13 | "properties": { |
17 | "element": {"#": "timeline_panel"} | 14 | "element": {"#": "timeline_panel"}, |
18 | } | 15 | "user_layers": {"#": "user_layers"}, |
19 | } | 16 | "track_container": {"#": "right_inside"}, |
20 | 17 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, | |
21 | } | 18 | "layer_tracks": {"#": "layer_tracks"}, |
22 | </script> | 19 | "master_track": {"#": "master_track"}, |
20 | "newlayer_button": {"#": "newlayer_button"}, | ||
21 | "deletelayer_button": {"#": "deletelayer_button"}, | ||
22 | "time_markers" : {"#": "timeline_markers"}, | ||
23 | "layerRepetition" : {"@": "repetition1"}, | ||
24 | "trackRepetition" : {"@" : "repetition2"}, | ||
25 | "playhead": {"#": "playhead"}, | ||
26 | "playheadmarker": {"#": "playhead_marker"}, | ||
27 | "timetext" : {"#": "time_text"} | ||
28 | } | ||
29 | }, | ||
23 | 30 | ||
31 | "timelineResize" : { | ||
32 | "module": "js/panels/Resizer", | ||
33 | "name": "Resizer", | ||
34 | "properties": { | ||
35 | "element": {"#": "layer_resizer"}, | ||
36 | "panel" : {"#" : "timeline_leftpane"}, | ||
37 | "isVertical" : false, | ||
38 | "isInversed" : false, | ||
39 | "isPanel" : false | ||
40 | } | ||
41 | }, | ||
42 | |||
43 | |||
44 | "repetition1": { | ||
45 | "module": "montage/ui/repetition.reel", | ||
46 | "name": "Repetition", | ||
47 | "properties": { | ||
48 | "element": {"#": "container-layers"}, | ||
49 | "isSelectionEnabled" : true | ||
50 | }, | ||
51 | "bindings": { | ||
52 | "objects": { | ||
53 | "boundObject": {"@": "owner"}, | ||
54 | "boundObjectPropertyPath": "arrLayers", | ||
55 | "oneway": false | ||
56 | } | ||
57 | } | ||
58 | }, | ||
59 | "layer" : { | ||
60 | "module" : "js/panels/Timeline/Layer.reel", | ||
61 | "name" : "Layer", | ||
62 | "properties" : { | ||
63 | "element": {"#": "container-layer"} | ||
64 | }, | ||
65 | "bindings" : { | ||
66 | "layerName" : { | ||
67 | "boundObject" : {"@" : "repetition1"}, | ||
68 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName", | ||
69 | "oneway" : false | ||
70 | }, | ||
71 | "layerID" : { | ||
72 | "boundObject" : {"@" : "repetition1"}, | ||
73 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", | ||
74 | "oneway" : false | ||
75 | }, | ||
76 | "arrLayerStyles" : { | ||
77 | "boundObject" : {"@" : "repetition1"}, | ||
78 | "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles", | ||
79 | "oneway" : false | ||
80 | }, | ||
81 | "isMainCollapsed" : { | ||
82 | "boundObject" : {"@" : "repetition1"}, | ||
83 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", | ||
84 | "oneway" : false | ||
85 | }, | ||
86 | "isPositionCollapsed" : { | ||
87 | "boundObject" : {"@" : "repetition1"}, | ||
88 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", | ||
89 | "oneway" : false | ||
90 | }, | ||
91 | "isTransformCollapsed" : { | ||
92 | "boundObject" : {"@" : "repetition1"}, | ||
93 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | ||
94 | "oneway" : false | ||
95 | }, | ||
96 | "isSelected" : { | ||
97 | "boundObject" : {"@" : "repetition1"}, | ||
98 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected", | ||
99 | "oneway" : false | ||
100 | }, | ||
101 | "isActive" : { | ||
102 | "boundObject" : {"@" : "repetition1"}, | ||
103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive", | ||
104 | "oneway" : false | ||
105 | }, | ||
106 | "isStyleCollapsed" : { | ||
107 | "boundObject" : {"@" : "repetition1"}, | ||
108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | ||
109 | "oneway" : false | ||
110 | } | ||
111 | } | ||
112 | }, | ||
113 | |||
114 | "repetition2" : { | ||
115 | "module": "montage/ui/repetition.reel", | ||
116 | "name": "Repetition", | ||
117 | "properties": { | ||
118 | "element": {"#": "container-tracks"}, | ||
119 | "isSelectionEnabled" : false | ||
120 | }, | ||
121 | "bindings": { | ||
122 | "objects": { | ||
123 | "boundObject": {"@": "owner"}, | ||
124 | "boundObjectPropertyPath": "arrTracks", | ||
125 | "oneway": false | ||
126 | } | ||
127 | } | ||
128 | }, | ||
129 | "track" : { | ||
130 | "module" : "js/panels/Timeline/TimelineTrack.reel", | ||
131 | "name" : "TimelineTrack", | ||
132 | "properties" : { | ||
133 | "element": {"#": "container-track"} | ||
134 | }, | ||
135 | "bindings" : { | ||
136 | "trackID" : { | ||
137 | "boundObject" : {"@" : "repetition2"}, | ||
138 | "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID", | ||
139 | "oneway" : false | ||
140 | }, | ||
141 | "tweens" : { | ||
142 | "boundObject" : {"@" : "repetition2"}, | ||
143 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens", | ||
144 | "oneway" : false | ||
145 | }, | ||
146 | "isMainCollapsed" : { | ||
147 | "boundObject" : {"@" : "repetition2"}, | ||
148 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", | ||
149 | "oneway" : false | ||
150 | }, | ||
151 | "isPositionCollapsed" : { | ||
152 | "boundObject" : {"@" : "repetition2"}, | ||
153 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", | ||
154 | "oneway" : false | ||
155 | }, | ||
156 | "isTransformCollapsed" : { | ||
157 | "boundObject" : {"@" : "repetition2"}, | ||
158 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | ||
159 | "oneway" : false | ||
160 | }, | ||
161 | "isStyleCollapsed" : { | ||
162 | "boundObject" : {"@" : "repetition2"}, | ||
163 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | ||
164 | "oneway" : false | ||
165 | } | ||
166 | } | ||
167 | } | ||
168 | } | ||
169 | </script> | ||
24 | 170 | ||
25 | </head> | 171 | </head> |
26 | <body> | 172 | <body> |
27 | 173 | ||
28 | <div id="timeline_panel"> | 174 | <div id="timeline_panel" class="tl_container"> |