diff options
author | Valerio Virgillito | 2012-05-23 14:25:17 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-23 14:25:17 -0700 |
commit | 1a7e347810401e6262d9d7bad1c3583e6773993b (patch) | |
tree | de4c310be3a47cfc1bab39f81857ea8d9ead3809 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | 6dfd2e7bb01ae4b60845fba858207364aef68f72 (diff) | |
parent | f1dbf7c58e91a27c80f3a607e87ad122d803c500 (diff) | |
download | ninja-1a7e347810401e6262d9d7bad1c3583e6773993b.tar.gz |
Merge pull request #253 from mqg734/Dom-Architecture
Fixing triggerBinding warning from timeline panel.
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 |
1 files changed, 3 insertions, 6 deletions
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 : { |