diff options
| author | Jonathan Duran | 2012-02-25 16:20:16 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-25 16:20:16 -0800 |
| commit | 4e15de39bc1ea1a4c1141373d08b858b20106987 (patch) | |
| tree | ef3030d561a0bef731f84078d5ece503cd60f37e /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 1bc2de516c86f67c2107bd50df0589a273f4c5ab (diff) | |
| parent | f14bc1ace048e46cbcb7148dbe37a5d2065a3779 (diff) | |
| download | ninja-4e15de39bc1ea1a4c1141373d08b858b20106987.tar.gz | |
Merge branch 'refs/heads/Timeline-local' into Timeline
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 0c302436..9d0b8210 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 | }, |