aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-02 12:24:33 -0800
committerPushkar Joshi2012-03-02 12:24:33 -0800
commit4419209a1fd850ab468209b562b66b0242b42a9c (patch)
treebd7ca04f963f5a3aeb4b3c06db6f187903307d45 /js/panels/Timeline/Tween.reel
parent1b68bb87c458877cb850a96d8a093d6064bc41dc (diff)
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
downloadninja-4419209a1fd850ab468209b562b66b0242b42a9c.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js16
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) {