Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into integration

1 files changed, 17 insertions, 2 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 92adee05..77481ac0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -101,6 +101,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
+                                "animateCollapser" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "oneway" : false
+                                },
                                 "isSelected" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
@@ -116,6 +121,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
                                 },
+                                "animateCollapser" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "oneway" : false
+                                },
                                 "dtextPositionX" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
@@ -164,7 +174,7 @@
                         "bindings": {
                             "objects": {
                                 "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "arrTracks",
+                                "boundObjectPropertyPath": "arrLayers",
                                 "oneway": false
                             }
                         }
@@ -178,7 +188,7 @@
                         "bindings" : {
                                 "trackID" : {
                                         "boundObject" : {"@" : "repetition2"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
                                         "oneway" : false
                                 },
                                 "tweens" : {
@@ -231,6 +241,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
+                                "animateCollapser" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "oneway" : false
+                                },
                                 "isStyleCollapsed" : {
                                         "boundObject" : {"@" : "repetition2"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",