diff options
author | Jonathan Duran | 2012-03-16 16:30:59 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-16 16:30:59 -0700 |
commit | f23bc5d195cfbe47cafe7e01f961e8f1631cff7c (patch) | |
tree | 8184c825d302719870a5726570c86914077ec180 /js/panels/Timeline/TimelinePanel.reel | |
parent | 319b45ac31acdc50935c3de4da46e14e68395a1b (diff) | |
parent | 870ba80431960dd108cc9ddf79d9af9d943b39ef (diff) | |
download | ninja-f23bc5d195cfbe47cafe7e01f961e8f1631cff7c.tar.gz |
Merge branch 'refs/heads/Timeline-local' into TimelineDOM
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 9d7a1d44..6e7d410c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -75,7 +75,12 @@ | |||
75 | "boundObject" : {"@" : "repetition1"}, | 75 | "boundObject" : {"@" : "repetition1"}, |
76 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 76 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
77 | "oneway" : false | 77 | "oneway" : false |
78 | } | 78 | }, |
79 | "bindingPoint" : { | ||
80 | "boundObject" : {"@" : "repetition1"}, | ||
81 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
82 | "oneway" : false | ||
83 | } | ||
79 | } | 84 | } |
80 | }, | 85 | }, |
81 | 86 | ||
@@ -105,7 +110,13 @@ | |||
105 | "boundObject" : {"@" : "repetition2"}, | 110 | "boundObject" : {"@" : "repetition2"}, |
106 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 111 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
107 | "oneway" : false | 112 | "oneway" : false |
113 | }, | ||
114 | "bindingPoint" : { | ||
115 | "boundObject" : {"@" : "repetition2"}, | ||
116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
117 | "oneway" : false | ||
108 | } | 118 | } |
119 | |||
109 | } | 120 | } |
110 | }, | 121 | }, |
111 | "endHottext" : { | 122 | "endHottext" : { |
@@ -193,4 +204,4 @@ | |||
193 | </div> | 204 | </div> |
194 | 205 | ||
195 | </body> | 206 | </body> |
196 | </html> \ No newline at end of file | 207 | </html> |