diff options
| author | Jon Reid | 2012-06-12 13:32:02 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
| commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
| tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/panels/Timeline/Layer.reel/Layer.html | |
| parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
| parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
| download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 44022211..3648cbbb 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -22,7 +22,12 @@ | |||
| 22 | "positionCollapser" : {"@" : "positionCollapser"}, | 22 | "positionCollapser" : {"@" : "positionCollapser"}, |
| 23 | "styleCollapser" : {"@" : "styleCollapser"}, | 23 | "styleCollapser" : {"@" : "styleCollapser"}, |
| 24 | "clickerMain" : {"#" : "clicker-main"}, | 24 | "clickerMain" : {"#" : "clicker-main"}, |
| 25 | "myLabel" : {"#" : "myLabel"} | 25 | "myLabel" : {"#" : "myLabel"}, |
| 26 | "leftControl": {"@" : "dtext_position_x"}, | ||
| 27 | "topControl": {"@" : "dtext_position_y"}, | ||
| 28 | "widthControl": {"@" : "dtext_scale_x"}, | ||
| 29 | "heightControl": {"@" : "dtext_scale_y"}, | ||
| 30 | "styleType":{"@" : "style"} | ||
| 26 | } | 31 | } |
| 27 | }, | 32 | }, |
| 28 | "dtext1" : { | 33 | "dtext1" : { |
| @@ -105,7 +110,12 @@ | |||
| 105 | "boundObject" : {"@": "repetition1"}, | 110 | "boundObject" : {"@": "repetition1"}, |
| 106 | "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", | 111 | "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", |
| 107 | "oneway" : false | 112 | "oneway" : false |
| 108 | } | 113 | }, |
| 114 | "colorelement" : { | ||
| 115 | "boundObject" : {"@": "repetition1"}, | ||
| 116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement", | ||
| 117 | "oneway" : false | ||
| 118 | } | ||
| 109 | } | 119 | } |
| 110 | }, | 120 | }, |
| 111 | "dtext_position_x" : { | 121 | "dtext_position_x" : { |
| @@ -148,10 +158,10 @@ | |||
| 148 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 158 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 149 | "properties": { | 159 | "properties": { |
| 150 | "element": {"#": "scale-x"}, | 160 | "element": {"#": "scale-x"}, |
| 151 | "maxValue" : 100, | 161 | "maxValue" : 100000, |
| 152 | "minValue" : 0, | 162 | "minValue" : -100000, |
| 153 | "acceptableUnits" : "%", | 163 | "acceptableUnits" : "px", |
| 154 | "units" : "%", | 164 | "units" : "px", |
| 155 | "value" : 0 | 165 | "value" : 0 |
| 156 | }, | 166 | }, |
| 157 | "bindings": { | 167 | "bindings": { |
| @@ -166,10 +176,10 @@ | |||
| 166 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 176 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 167 | "properties": { | 177 | "properties": { |
| 168 | "element": {"#": "scale-y"}, | 178 | "element": {"#": "scale-y"}, |
| 169 | "maxValue" : 100, | 179 | "maxValue" : 100000, |
| 170 | "minValue" : 0, | 180 | "minValue" : -100000, |
| 171 | "acceptableUnits" : "%", | 181 | "acceptableUnits" : "px", |
| 172 | "units" : "%", | 182 | "units" : "px", |
| 173 | "value" : 0 | 183 | "value" : 0 |
| 174 | }, | 184 | }, |
| 175 | "bindings": { | 185 | "bindings": { |