aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJon Reid2012-02-27 20:26:49 -0800
committerJon Reid2012-02-27 20:26:49 -0800
commit445180591da04f681a22038600e8ab517b82c0ca (patch)
treec621c195eacfb05158b871c6fe7ab6a140a09fad /js/panels/Timeline/Tween.reel/Tween.js
parent8f3fba1d9febcbb16f1465196f339ff04bf15077 (diff)
downloadninja-445180591da04f681a22038600e8ab517b82c0ca.tar.gz
Timeline: try to clean up bogus events manually.
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 70b52297..a9ee1fec 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -138,9 +138,12 @@ var Tween = exports.Tween = Montage.create(Component, {
138 138
139 handleElementChange:{ 139 handleElementChange:{
140 value:function (event) { 140 value:function (event) {
141
141 if (event.detail.source && event.detail.source !== "tween") { 142 if (event.detail.source && event.detail.source !== "tween") {
142 // check for correct element selection 143 // check for correct element selection
143 console.log(this.application.ninja.selectedElements[0]._element) 144 console.log("handleElementChange! " + this.tweenID)
145 console.log(this.application.ninja.selectedElements[0]._element);
146 console.log(this.parentComponent.parentComponent.animatedElement);
144 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { 147 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) {
145 alert("Wrong element selected for this keyframe track"); 148 alert("Wrong element selected for this keyframe track");
146 } else { 149 } else {
@@ -162,6 +165,7 @@ var Tween = exports.Tween = Montage.create(Component, {
162 selectTween:{ 165 selectTween:{
163 value: function(){ 166 value: function(){
164 // turn on event listener for element change 167 // turn on event listener for element change
168 console.log('adding elementChange event listener for tween ' + this.tweenID)
165 this.eventManager.addEventListener("elementChange", this, false); 169 this.eventManager.addEventListener("elementChange", this, false);
166 170
167 // select the containing layer 171 // select the containing layer