diff options
author | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
commit | e64328dc08418730ca580d33381cb2001c7a96fd (patch) | |
tree | 74e3996696adfea94158c29575e9393e56169930 /js/panels/Timeline/Layer.reel/Layer.js | |
parent | d57cd68741f340a45be780675ed79b5caf2094e9 (diff) | |
parent | a8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff) | |
download | ninja-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/Layer.reel/Layer.js')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 6 |
1 files changed, 1 insertions, 5 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 */ |