diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 163 | ||||
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 210 |
2 files changed, 103 insertions, 270 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index ae1bcddf..0886bd6c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -71,91 +71,11 @@ | |||
| 71 | "element": {"#": "container-layer"} | 71 | "element": {"#": "container-layer"} |
| 72 | }, | 72 | }, |
| 73 | "bindings" : { | 73 | "bindings" : { |
| 74 | "layerName" : { | 74 | "layerData" : { |
| 75 | "boundObject" : {"@" : "repetition1"}, | 75 | "boundObject" : {"@" : "repetition2"}, |
| 76 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName", | 76 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
| 77 | "oneway" : false | 77 | "oneway" : false |
| 78 | }, | 78 | } |
| 79 | "layerID" : { | ||
| 80 | "boundObject" : {"@" : "repetition1"}, | ||
| 81 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", | ||
| 82 | "oneway" : false | ||
| 83 | }, | ||
| 84 | "arrLayerStyles" : { | ||
| 85 | "boundObject" : {"@" : "repetition1"}, | ||
| 86 | "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles", | ||
| 87 | "oneway" : false | ||
| 88 | }, | ||
| 89 | "isMainCollapsed" : { | ||
| 90 | "boundObject" : {"@" : "repetition1"}, | ||
| 91 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", | ||
| 92 | "oneway" : false | ||
| 93 | }, | ||
| 94 | "isPositionCollapsed" : { | ||
| 95 | "boundObject" : {"@" : "repetition1"}, | ||
| 96 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", | ||
| 97 | "oneway" : false | ||
| 98 | }, | ||
| 99 | "isTransformCollapsed" : { | ||
| 100 | "boundObject" : {"@" : "repetition1"}, | ||
| 101 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | ||
| 102 | "oneway" : false | ||
| 103 | }, | ||
| 104 | "isSelected" : { | ||
| 105 | "boundObject" : {"@" : "repetition1"}, | ||
| 106 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected", | ||
| 107 | "oneway" : false | ||
| 108 | }, | ||
| 109 | "isActive" : { | ||
| 110 | "boundObject" : {"@" : "repetition1"}, | ||
| 111 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive", | ||
| 112 | "oneway" : false | ||
| 113 | }, | ||
| 114 | "isStyleCollapsed" : { | ||
| 115 | "boundObject" : {"@" : "repetition1"}, | ||
| 116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | ||
| 117 | "oneway" : false | ||
| 118 | }, | ||
| 119 | "bypassAnimation" : { | ||
| 120 | "boundObject" : {"@" : "repetition1"}, | ||
| 121 | "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation", | ||
| 122 | "oneway" : false | ||
| 123 | }, | ||
| 124 | "dtextPositionX" : { | ||
| 125 | "boundObject" : {"@" : "repetition1"}, | ||
| 126 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX", | ||
| 127 | "oneway" : false | ||
| 128 | }, | ||
| 129 | "dtextPositionY" : { | ||
| 130 | "boundObject" : {"@" : "repetition1"}, | ||
| 131 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY", | ||
| 132 | "oneway" : false | ||
| 133 | }, | ||
| 134 | "dtextSkewX" : { | ||
| 135 | "boundObject" : {"@" : "repetition1"}, | ||
| 136 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX", | ||
| 137 | "oneway" : false | ||
| 138 | }, | ||
| 139 | "dtextSkewY" : { | ||
| 140 | "boundObject" : {"@" : "repetition1"}, | ||
| 141 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY", | ||
| 142 | "oneway" : false | ||
| 143 | }, | ||
| 144 | "dtextScaleX" : { | ||
| 145 | "boundObject" : {"@" : "repetition1"}, | ||
| 146 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX", | ||
| 147 | "oneway" : false | ||
| 148 | }, | ||
| 149 | "dtextScaleY" : { | ||
| 150 | "boundObject" : {"@" : "repetition1"}, | ||
| 151 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY", | ||
| 152 | "oneway" : false | ||
| 153 | }, | ||
| 154 | "dtextRotate" : { | ||
| 155 | "boundObject" : {"@" : "repetition1"}, | ||
| 156 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate", | ||
| 157 | "oneway" : false | ||
| 158 | } | ||
| 159 | } | 79 | } |
| 160 | }, | 80 | }, |
| 161 | 81 | ||
| @@ -181,76 +101,11 @@ | |||
| 181 | "element": {"#": "container-track"} | 101 | "element": {"#": "container-track"} |
| 182 | }, | 102 | }, |
| 183 | "bindings" : { | 103 | "bindings" : { |
| 184 | "trackID" : { | 104 | "trackData" : { |
| 185 | "boundObject" : {"@" : "repetition2"}, | 105 | "boundObject" : {"@" : "repetition2"}, |
| 186 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", | 106 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
| 187 | "oneway" : false | ||
| 188 | }, | ||
| 189 | "tweens" : { | ||
| 190 | "boundObject" : {"@" : "repetition2"}, | ||
| 191 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens", | ||
| 192 | "oneway" : false | ||
| 193 | }, | ||
| 194 | "animatedElement" : { | ||
| 195 | "boundObject" : {"@" : "repetition2"}, | ||
| 196 | "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement", | ||
| 197 | "oneway" : false | 107 | "oneway" : false |
| 198 | }, | 108 | } |
| 199 | "arrStyleTracks" : { | ||
| 200 | "boundObject" : {"@" : "repetition2"}, | ||
| 201 | "boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks", | ||
| 202 | "oneway" : false | ||
| 203 | }, | ||
| 204 | "isTrackAnimated" : { | ||
| 205 | "boundObject" : {"@" : "repetition2"}, | ||
| 206 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated", | ||
| 207 | "oneway" : false | ||
| 208 | }, | ||
| 209 | "trackDuration" : { | ||
| 210 | "boundObject" : {"@" : "repetition2"}, | ||
| 211 | "boundObjectPropertyPath" : "objectAtCurrentIteration.trackDuration", | ||
| 212 | "oneway" : false | ||
| 213 | }, | ||
| 214 | "animationName" : { | ||
| 215 | "boundObject" : {"@" : "repetition2"}, | ||
| 216 | "boundObjectPropertyPath" : "objectAtCurrentIteration.animationName", | ||
| 217 | "oneway" : false | ||
| 218 | }, | ||
| 219 | "currentKeyframeRule" : { | ||
| 220 | "boundObject" : {"@" : "repetition2"}, | ||
| 221 | "boundObjectPropertyPath" : "objectAtCurrentIteration.currentKeyframeRule", | ||
| 222 | "oneway" : false | ||
| 223 | }, | ||
| 224 | "isMainCollapsed" : { | ||
| 225 | "boundObject" : {"@" : "repetition2"}, | ||
| 226 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", | ||
| 227 | "oneway" : false | ||
| 228 | }, | ||
| 229 | "isPositionCollapsed" : { | ||
| 230 | "boundObject" : {"@" : "repetition2"}, | ||
| 231 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", | ||
| 232 | "oneway" : false | ||
| 233 | }, | ||
| 234 | "isTransformCollapsed" : { | ||
| 235 | "boundObject" : {"@" : "repetition2"}, | ||
| 236 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | ||
| 237 | "oneway" : false | ||
| 238 | }, | ||
| 239 | "bypassAnimation" : { | ||
| 240 | "boundObject" : {"@" : "repetition2"}, | ||
| 241 | "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation", | ||
| 242 | "oneway" : false | ||
| 243 | }, | ||
| 244 | "isStyleCollapsed" : { | ||
| 245 | "boundObject" : {"@" : "repetition2"}, | ||
| 246 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | ||
| 247 | "oneway" : false | ||
| 248 | }, | ||
| 249 | "trackPosition" : { | ||
| 250 | "boundObject" : {"@" : "repetition2"}, | ||
| 251 | "boundObjectPropertyPath" : "objectAtCurrentIteration.trackPosition", | ||
| 252 | "oneway" : false | ||
| 253 | } | ||
| 254 | } | 109 | } |
| 255 | }, | 110 | }, |
| 256 | "endHottext" : { | 111 | "endHottext" : { |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 9c782787..54c40676 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -284,12 +284,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 284 | value:function () { | 284 | value:function () { |
| 285 | var myIndex; | 285 | var myIndex; |
| 286 | this.drawTimeMarkers(); | 286 | this.drawTimeMarkers(); |
| 287 | |||