From f1dbf7c58e91a27c80f3a607e87ad122d803c500 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 23 May 2012 13:29:13 -0700
Subject: Timeline triggerBinding needs to be set to false in the track data.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/panels/Timeline/Layer.reel/Layer.js | 6 +-----
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 +++------
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 6 +-----
3 files changed, 5 insertions(+), 16 deletions(-)
(limited to 'js/panels')
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, {
triggerOutgoingBinding : {
value: function() {
- if (this.layerData.triggerBinding === true) {
- this.layerData.triggerBinding = false;
- } else {
- this.layerData.triggerBinding = true;
- }
+ this.layerData.triggerBinding = !this.layerData.triggerBinding;
}
},
/* 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, {
returnObj.layerData.isVisible = true;
returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid;
returnObj.layerData.isTrackAnimated = false;
+ returnObj.layerData.triggerBinding = false;
returnObj.parentElementUUID = null;
returnObj.parentElement = null;
@@ -1402,12 +1403,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
// Trigger the layer/track data binding
triggerLayerBinding : {
value: function(intIndex) {
- if (this.arrLayers[intIndex].layerData.triggerBinding === true) {
- this.arrLayers[intIndex].layerData.triggerBinding = false;
- } else {
- this.arrLayers[intIndex].layerData.triggerBinding = true;
- }
- }
+ this.arrLayers[intIndex].layerData.triggerBinding = !this.arrLayers[intIndex].layerData.triggerBinding;
+ }
},
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, {
triggerOutgoingBinding : {
value: function() {
- if (this.trackData.triggerBinding === true) {
- this.trackData.triggerBinding = false;
- } else {
- this.trackData.triggerBinding = true;
- }
+ this.trackData.triggerBinding = !this.trackData.triggerBinding;
}
},
--
cgit v1.2.3