Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

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, {
             this.needsDraw = true;
         }
     },
+    
+    _isClearing : {
+        serializable: true,
+        value: false
+    },
+    isClearing : {
+        get: function() {
+                return this._isClearing;
+        },
+        set: function(newVal) {
+                if (newVal === "clear it") {
+                        this.eventManager.removeEventListener("elementChange", this, false);
+                }
+        }
+    },
 
     prepareForDraw:{
         value:function () {
@@ -138,6 +153,7 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     handleElementChange:{
         value:function (event) {
+                
             if (event.detail.source && event.detail.source !== "tween") {
                 // check for correct element selection
                 if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) {