diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 309 |
1 files changed, 155 insertions, 154 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 1889e41b..b0e1c735 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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,9 +30,9 @@ 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/TimelineTrack.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/TimelineTrack.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "owner": { | 38 | "owner": { |
@@ -50,11 +51,11 @@ POSSIBILITY OF SUCH DAMAGE. | |||
50 | }, | 51 | }, |
51 | 52 | ||
52 | "tween" : { | 53 | "tween" : { |
53 | "prototype" : "js/panels/timeline/Tween.reel", | 54 | "prototype" : "js/panels/timeline/Tween.reel", |
54 | "properties" : { | 55 | "properties" : { |
55 | "element":{"#": "track_lane"} | 56 | "element":{"#": "track_lane"} |
56 | }, | 57 | }, |
57 | "bindings" : { | 58 | "bindings" : { |
58 | "tweenData" : { | 59 | "tweenData" : { |
59 | "boundObject" : {"@": "tweenRepetition"}, | 60 | "boundObject" : {"@": "tweenRepetition"}, |
60 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", | 61 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", |
@@ -65,64 +66,64 @@ POSSIBILITY OF SUCH DAMAGE. | |||
65 | 66 | ||
66 | "tweenRepetition": { | 67 | "tweenRepetition": { |
67 | "prototype": "montage/ui/repetition.reel", | 68 | "prototype": "montage/ui/repetition.reel", |
68 | "properties": { | 69 | "properties": { |
69 | "element": {"#": "track_lanes"}, | 70 | "element": {"#": "track_lanes"}, |
70 | "isSelectionEnabled" : false | 71 | "isSelectionEnabled" : false |
71 | }, | 72 | }, |
72 | "bindings": { | 73 | "bindings": { |
73 | "objects": { | 74 | "objects": { |
74 | "boundObject": {"@": "owner"}, | 75 | "boundObject": {"@": "owner"}, |
75 | "boundObjectPropertyPath": "tweens", | 76 | "boundObjectPropertyPath": "tweens", |
76 | "oneway": false | 77 | "oneway": false |
77 | } | 78 | } |
78 | } | 79 | } |
79 | }, | 80 | }, |
80 | "styleTrackRepetition": { | 81 | "styleTrackRepetition": { |
81 | "prototype": "montage/ui/repetition.reel", | 82 | "prototype": "montage/ui/repetition.reel", |
82 | "properties": { | 83 | "properties": { |
83 | "element": {"#": "content_style_tracks"}, | 84 | "element": {"#": "content_style_tracks"}, |
84 | "isSelectionEnabled" : false | 85 | "isSelectionEnabled" : false |
85 | }, | 86 | }, |
86 | "bindings": { | 87 | "bindings": { |
87 | "objects": { | 88 | "objects": { |
88 | "boundObject": {"@": "owner"}, | 89 | "boundObject": {"@": "owner"}, |
89 | "boundObjectPropertyPath": "arrStyleTracks", | 90 | "boundObjectPropertyPath": "arrStyleTracks", |
90 | "oneway": false | 91 | "oneway": false |
91 | } | 92 | } |
92 | } | 93 | } |
93 | }, | 94 | }, |
94 | "stylePropertyTrack" : { | 95 | "stylePropertyTrack" : { |
95 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", | 96 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", |
96 | "properties" : { | 97 | "properties" : { |
97 | "element":{"#": "style-track-base"} | 98 | "element":{"#": "style-track-base"} |
98 | }, | 99 | }, |
99 | "bindings" : { | 100 | "bindings" : { |
100 | "propTrackData" : { | 101 | "propTrackData" : { |
101 | "boundObject" : {"@" : "styleTrackRepetition"}, | 102 | "boundObject" : {"@" : "styleTrackRepetition"}, |
102 | "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData", | 103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData", |
103 | "oneway" : false | 104 | "oneway" : false |
104 | } | 105 | } |
105 | } | 106 | } |
106 | }, | 107 | }, |
107 | "positionTracksRepetition": { | 108 | "positionTracksRepetition": { |
108 | "prototype": "montage/ui/repetition.reel", | 109 | "prototype": "montage/ui/repetition.reel", |
109 | "properties": { | 110 | "properties": { |
110 | "element": {"#": "content_position_tracks"}, | 111 | "element": {"#": "content_position_tracks"}, |
111 | "isSelectionEnabled" : false | 112 | "isSelectionEnabled" : false |
112 | }, | 113 | }, |
113 | "bindings": { | 114 | "bindings": { |
114 | "objects": { | 115 | "objects": { |
115 | "boundObject": {"@": "owner"}, | 116 | "boundObject": {"@": "owner"}, |
116 | "boundObjectPropertyPath": "arrPositionTracks", | 117 | "boundObjectPropertyPath": "arrPositionTracks", |
117 | "oneway": false | 118 | "oneway": false |
118 | } | 119 | } |
119 | } | 120 | } |
120 | }, | 121 | }, |
121 | "positionPropertyTrack" : { | 122 | "positionPropertyTrack" : { |
122 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", | 123 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", |
123 | "properties" : { | 124 | "properties" : { |
124 | "element":{"#": "position_track_base"} | 125 | "element":{"#": "position_track_base"} |
125 | }, | 126 | }, |
126 | "bindings" : { | 127 | "bindings" : { |
127 | "propTrackData" : { | 128 | "propTrackData" : { |
128 | "boundObject" : {"@" : "positionTracksRepetition"}, | 129 | "boundObject" : {"@" : "positionTracksRepetition"}, |
@@ -130,97 +131,97 @@ POSSIBILITY OF SUCH DAMAGE. | |||
130 | "oneway" : false | 131 | "oneway" : false |
131 | } | 132 | } |
132 | } | 133 | } |
133 | }, | 134 | }, |
134 | 135 | ||
135 | "mainCollapser" : { | 136 | "mainCollapser" : { |
136 | "prototype" : "js/panels/timeline/Collapser", |