diff options
| author | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
| commit | 7c9291a5bab4abd849547f8878f6fb962fc88250 (patch) | |
| tree | d5dd4ee6ff901c00b40f3e89c3cfb620e60a5051 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 6054d13cf1254447d2396889eafc6a953f0b8d4a (diff) | |
| parent | 700611c9aaee6093bbf4e86503c1decb5ac65c83 (diff) | |
| download | ninja-7c9291a5bab4abd849547f8878f6fb962fc88250.tar.gz | |
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 0c302436..92adee05 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -115,6 +115,41 @@ | |||
| 115 | "boundObject" : {"@" : "repetition1"}, | 115 | "boundObject" : {"@" : "repetition1"}, |
| 116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | 116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", |
| 117 | "oneway" : false | 117 | "oneway" : false |
| 118 | }, | ||
| 119 | "dtextPositionX" : { | ||
| 120 | "boundObject" : {"@" : "repetition1"}, | ||
| 121 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX", | ||
| 122 | "oneway" : false | ||
| 123 | }, | ||
| 124 | "dtextPositionY" : { | ||
| 125 | "boundObject" : {"@" : "repetition1"}, | ||
| 126 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY", | ||
| 127 | "oneway" : false | ||
| 128 | }, | ||
| 129 | "dtextSkewX" : { | ||
| 130 | "boundObject" : {"@" : "repetition1"}, | ||
| 131 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX", | ||
| 132 | "oneway" : false | ||
| 133 | }, | ||
| 134 | "dtextSkewY" : { | ||
| 135 | "boundObject" : {"@" : "repetition1"}, | ||
| 136 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY", | ||
| 137 | "oneway" : false | ||
| 138 | }, | ||
| 139 | "dtextScaleX" : { | ||
| 140 | "boundObject" : {"@" : "repetition1"}, | ||
| 141 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX", | ||
| 142 | "oneway" : false | ||
| 143 | }, | ||
| 144 | "dtextScaleY" : { | ||
| 145 | "boundObject" : {"@" : "repetition1"}, | ||
| 146 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY", | ||
| 147 | "oneway" : false | ||
| 148 | }, | ||
| 149 | "dtextRotate" : { | ||
| 150 | "boundObject" : {"@" : "repetition1"}, | ||
| 151 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate", | ||
| 152 | "oneway" : false | ||
| 118 | } | 153 | } |
| 119 | } | 154 | } |
| 120 | }, | 155 | }, |
| @@ -264,7 +299,7 @@ | |||
| 264 | </div> | 299 | </div> |
| 265 | </div> | 300 | </div> |
| 266 | 301 | ||
| 267 | <div id="layer_resizer" class="layerresizer"></div> | 302 | <div data-montage-id="layer_resizer" class="layerresizer"></div> |
| 268 | 303 | ||
| 269 | <div id="timeline_rightpane" class="tl_rightpane"> | 304 | <div id="timeline_rightpane" class="tl_rightpane"> |
| 270 | <div id="right_inside" class="rightinside"> | 305 | <div id="right_inside" class="rightinside"> |