diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 15 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 14c5f1c8..34860ae7 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -77,7 +77,12 @@ | |||
77 | "boundObject" : {"@" : "repetition1"}, | 77 | "boundObject" : {"@" : "repetition1"}, |
78 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 78 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
79 | "oneway" : false | 79 | "oneway" : false |
80 | } | 80 | }, |
81 | "bindingPoint" : { | ||
82 | "boundObject" : {"@" : "repetition1"}, | ||
83 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
84 | "oneway" : false | ||
85 | } | ||
81 | } | 86 | } |
82 | }, | 87 | }, |
83 | 88 | ||
@@ -107,7 +112,13 @@ | |||
107 | "boundObject" : {"@" : "repetition2"}, | 112 | "boundObject" : {"@" : "repetition2"}, |
108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 113 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
109 | "oneway" : false | 114 | "oneway" : false |
115 | }, | ||
116 | "bindingPoint" : { | ||
117 | "boundObject" : {"@" : "repetition2"}, | ||
118 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
119 | "oneway" : false | ||
110 | } | 120 | } |
121 | |||
111 | } | 122 | } |
112 | }, | 123 | }, |
113 | "endHottext" : { | 124 | "endHottext" : { |
@@ -197,4 +208,4 @@ | |||
197 | </div> | 208 | </div> |
198 | 209 | ||
199 | </body> | 210 | </body> |
200 | </html> \ No newline at end of file | 211 | </html> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index a1e320c4..be5aace4 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -718,7 +718,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
718 | this._LayerUndoObject = thingToPush; | 718 | this._LayerUndoObject = thingToPush; |
719 | this._LayerUndoIndex = thingToPush.layerData.layerID; | 719 | this._LayerUndoIndex = thingToPush.layerData.layerID; |
720 | this._LayerUndoStatus = true; | 720 | this._LayerUndoStatus = true; |
721 | |||
722 | } | 721 | } |
723 | 722 | ||
724 | } | 723 | } |