diff options
author | Nivesh Rajbhandari | 2012-05-23 13:29:13 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-23 13:29:13 -0700 |
commit | f1dbf7c58e91a27c80f3a607e87ad122d803c500 (patch) | |
tree | 2178408370629dddeaa057a9b9ba7b21fc3d88a4 /js/panels/Timeline | |
parent | 56b03609ada81b270f870d1bb0727ef146cb62e8 (diff) | |
download | ninja-f1dbf7c58e91a27c80f3a607e87ad122d803c500.tar.gz |
Timeline triggerBinding needs to be set to false in the track data.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 6 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 6358a0e0..e8619d02 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -498,11 +498,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
498 | 498 | ||
499 | triggerOutgoingBinding : { | 499 | triggerOutgoingBinding : { |
500 | value: function() { | 500 | value: function() { |
501 | if (this.layerData.triggerBinding === true) { | 501 | this.layerData.triggerBinding = !this.layerData.triggerBinding; |
502 | this.layerData.triggerBinding = false; | ||
503 | } else { | ||
504 | this.layerData.triggerBinding = true; | ||
505 | } | ||
506 | } | 502 | } |
507 | }, | 503 | }, |
508 | /* END: Models */ | 504 | /* END: Models */ |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index c382c9a7..80133edf 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -437,6 +437,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
437 | returnObj.layerData.isVisible = true; | 437 | returnObj.layerData.isVisible = true; |
438 | returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid; | 438 | returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid; |
439 | returnObj.layerData.isTrackAnimated = false; | 439 | returnObj.layerData.isTrackAnimated = false; |
440 | returnObj.layerData.triggerBinding = false; | ||
440 | returnObj.parentElementUUID = null; | 441 | returnObj.parentElementUUID = null; |
441 | returnObj.parentElement = null; | 442 | returnObj.parentElement = null; |
442 | 443 | ||
@@ -1402,12 +1403,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1402 | // Trigger the layer/track data binding | 1403 | // Trigger the layer/track data binding |
1403 | triggerLayerBinding : { | 1404 | triggerLayerBinding : { |
1404 | value: function(intIndex) { | 1405 | value: function(intIndex) { |
1405 | if (this.arrLayers[intIndex].layerData.triggerBinding === true) { | 1406 | this.arrLayers[intIndex].layerData.triggerBinding = !this.arrLayers[intIndex].layerData.triggerBinding; |
1406 | this.arrLayers[intIndex].layerData.triggerBinding = false; | 1407 | } |
1407 | } else { | ||
1408 | this.arrLayers[intIndex].layerData.triggerBinding = true; | ||
1409 | } | ||
1410 | } | ||
1411 | }, | 1408 | }, |
1412 | 1409 | ||
1413 | handleLayerDragStart : { | 1410 | handleLayerDragStart : { |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 2c15a99c..3d83dc36 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -405,11 +405,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
405 | 405 | ||
406 | triggerOutgoingBinding : { | 406 | triggerOutgoingBinding : { |
407 | value: function() { | 407 | value: function() { |
408 | if (this.trackData.triggerBinding === true) { | 408 | this.trackData.triggerBinding = !this.trackData.triggerBinding; |
409 | this.trackData.triggerBinding = false; | ||
410 | } else { | ||
411 | this.trackData.triggerBinding = true; | ||
412 | } | ||
413 | } | 409 | } |
414 | }, | 410 | }, |
415 | 411 | ||