diff options
author | Valerio Virgillito | 2012-02-28 13:41:12 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-28 13:41:12 -0800 |
commit | b0b4d6492d6ddd3b7ab39c2f4d1c01b8e9bacfb6 (patch) | |
tree | e48cd56730d8a3327cd8c34e602f704701ce6115 /js/panels/Timeline/Tween.reel/Tween.js | |
parent | 7cafa0464ee0c1621ffea04c2192f19008c9fc49 (diff) | |
parent | 538db48f38ad3d5d22e99c2881745fc916e7e8a2 (diff) | |
download | ninja-b0b4d6492d6ddd3b7ab39c2f4d1c01b8e9bacfb6.tar.gz |
Merge pull request #78 from imix23ways/Timeline
Timeline bug fixes
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index f6dbf32c..729abd64 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -118,6 +118,21 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
118 | this.needsDraw = true; | 118 | this.needsDraw = true; |
119 | } | 119 | } |
120 | }, | 120 | }, |
121 | |||
122 | _isClearing : { | ||
123 | serializable: true, | ||
124 | value: false | ||
125 | }, | ||
126 | isClearing : { | ||
127 | get: function() { | ||
128 | return this._isClearing; | ||
129 | }, | ||
130 | set: function(newVal) { | ||
131 | if (newVal === "clear it") { | ||
132 | this.eventManager.removeEventListener("elementChange", this, false); | ||
133 | } | ||
134 | } | ||
135 | }, | ||
121 | 136 | ||
122 | prepareForDraw:{ | 137 | prepareForDraw:{ |
123 | value:function () { | 138 | value:function () { |
@@ -138,6 +153,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
138 | 153 | ||
139 | handleElementChange:{ | 154 | handleElementChange:{ |
140 | value:function (event) { | 155 | value:function (event) { |
156 | |||
141 | if (event.detail.source && event.detail.source !== "tween") { | 157 | if (event.detail.source && event.detail.source !== "tween") { |
142 | // check for correct element selection | 158 | // check for correct element selection |
143 | if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { | 159 | if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { |