diff options
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 83d4ce73..60da4e71 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -35,6 +35,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
35 | value:null | 35 | value:null |
36 | }, | 36 | }, |
37 | 37 | ||
38 | isSubproperty:{ | ||
39 | value:true | ||
40 | }, | ||
41 | |||
38 | propTweenRepetition:{ | 42 | propTweenRepetition:{ |
39 | serializable:true, | 43 | serializable:true, |
40 | get:function () { | 44 | get:function () { |
@@ -111,11 +115,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
111 | 115 | ||
112 | handleClick:{ | 116 | handleClick:{ |
113 | value:function(ev){ | 117 | value:function(ev){ |
114 | var parentTrackID = this.parentComponent.parentComponent.parentComponent.trackID; | ||
115 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(parentTrackID); | ||
116 | //console.log(this.application.ninja.timeline.arrLayers[selectedIndex].layerData); | 118 | //console.log(this.application.ninja.timeline.arrLayers[selectedIndex].layerData); |
117 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | ||
118 | |||
119 | if (ev.shiftKey) { | 119 | if (ev.shiftKey) { |
120 | if (this.propTweens.length < 1) { | 120 | if (this.propTweens.length < 1) { |
121 | this.insertPropTween(0); | 121 | this.insertPropTween(0); |
@@ -137,6 +137,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
137 | 137 | ||
138 | insertPropTween:{ | 138 | insertPropTween:{ |
139 | value:function(clickPos){ | 139 | value:function(clickPos){ |
140 | var parentTrackID = this.parentComponent.parentComponent.parentComponent.trackID; | ||
141 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(parentTrackID); | ||
142 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | ||
143 | |||
140 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 144 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
141 | var currentMillisec = currentMillisecPerPixel * clickPos; | 145 | var currentMillisec = currentMillisecPerPixel * clickPos; |
142 | 146 | ||