aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-15 11:27:51 -0700
committerJonathan Duran2012-05-15 11:27:51 -0700
commite9995c973acadc507b802fdefdb22b4c4bf82325 (patch)
tree1d480c578245273c3f5c809aa8a37b2cf5d947ea /js/panels/Timeline/PropertyTrack.reel
parentb7adc6f1ec09edcad523b1ddd32856ddf27c6724 (diff)
downloadninja-e9995c973acadc507b802fdefdb22b4c4bf82325.tar.gz
fix keyframe splitting
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index b3a31bf2..f2004b94 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -201,7 +201,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
201 //console.log("Property track editorProperty set to: " + this.trackEditorProperty); 201 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
202 } 202 }
203 } else if (this.trackType === "position") { 203 } else if (this.trackType === "position") {
204 console.log("Property track editorProperty set to: " + this.trackEditorProperty); 204 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
205 } 205 }
206 206
207 this.insertPropTween(0); 207 this.insertPropTween(0);
@@ -217,7 +217,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
217 217
218 handleNewPropTween:{ 218 handleNewPropTween:{
219 value:function(ev){ 219 value:function(ev){
220 this.insertPropTween(ev.offsetX); 220 if (ev.offsetX > this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition) {
221 this.insertPropTween(ev.offsetX);
222 } else {
223 console.log("spitting sub keyframes not yet supported");
224 }
225
221 } 226 }
222 }, 227 },
223 228