aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js26
1 files changed, 23 insertions, 3 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 31e0b3b6..f2004b94 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -28,6 +28,21 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
28 } 28 }
29 }, 29 },
30 30
31 didDraw:{
32 value:function () {
33 if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.setLevel)) {
34 if (this.application.ninja.currentDocument.documentRoot.children[0]) {
35 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
36 if (selectedIndex !== false) {
37 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
38 //this.retrieveStoredStyleTweens();
39 }
40 }
41 }
42 }
43 }
44 },
45
31 trackEditorProperty:{ 46 trackEditorProperty:{
32 value:"" 47 value:""
33 }, 48 },
@@ -186,7 +201,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
186 //console.log("Property track editorProperty set to: " + this.trackEditorProperty); 201 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
187 } 202 }
188 } else if (this.trackType === "position") { 203 } else if (this.trackType === "position") {
189 console.log("Property track editorProperty set to: " + this.trackEditorProperty); 204 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
190 } 205 }
191 206
192 this.insertPropTween(0); 207 this.insertPropTween(0);
@@ -202,7 +217,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
202 217
203 handleNewPropTween:{ 218 handleNewPropTween:{
204 value:function(ev){ 219 value:function(ev){
205 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
206 } 226 }
207 }, 227 },
208 228
@@ -248,7 +268,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
248 268
249 retrieveStoredStyleTweens:{ 269 retrieveStoredStyleTweens:{
250 value:function(){ 270 value:function(){
251 271 console.log("retrieve style tweens");
252 } 272 }
253 }, 273 },
254 274