aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-24 11:38:51 -0700
committerJose Antonio Marquez2012-05-24 11:38:51 -0700
commite64328dc08418730ca580d33381cb2001c7a96fd (patch)
tree74e3996696adfea94158c29575e9393e56169930 /js/panels/Timeline/TimelineTrack.reel
parentd57cd68741f340a45be780675ed79b5caf2094e9 (diff)
parenta8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff)
downloadninja-e64328dc08418730ca580d33381cb2001c7a96fd.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index adc50c58..ff684446 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