1 files changed, 32 insertions, 2 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index d712f2bd..fa848cc0 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -222,7 +222,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                 value: function(event) {
                         // this should be handled via binding, but somehow is not. Setting manually for now.
                     this.editorProperty = this.myHintable.value;
-                    
                     // Change views.
                     this.whichView = "propval";
                 }
@@ -304,6 +303,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                                 this.valueEditorHottext.units = tweenable.units;
                                 this.valueEditorHottext.minValue = tweenable.min;
                                 this.valueEditorHottext.maxValue = tweenable.max;
+                this.valueEditorHottext.identifier="hottext"
+                this.valueEditorHottext.addEventListener("change",this,false);
+                this.valueEditorHottext.addEventListener("changing",this,false);
                                 this.valueEditorHottext.needsDraw = true;
                         } else if (tweenable.tweener === "color" ) {
                                 this.editorInputContainer.classList.add("hidden");
@@ -315,6 +317,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                                 this.editorColorContainer.classList.add("hidden");
                                 this.editorHottextContainer.classList.add("hidden");
                                 this.valueEditorInput.value = this.editorValue;
+                this.valueEditorInput.addEventListener("blur",this,false);
                         } else {
                                 this.log("Warning: unknown tweenable -"+tweenable.tweener+"- specified in style.js.")
                         }
@@ -558,7 +561,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                 {
                         "property" : "opacity",
                         "tweener" : "hottext",
-                        "units" : "%",
+                        "units" : "",
                         "min" : 0,
                         "max" : 100,
                         "default" : 100
@@ -614,6 +617,33 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
         ]
         
     },
+
+    handleHottextChange:{
+        value:function(event){
+
+            if(this.editorValue===""){
+                this.editorValue = 0;
+            }
+            this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline");
+        }
+    },
+
+    handleHottextChanging:{
+        value:function(event){
+
+            if(this.editorValue===""){
+                this.editorValue = 0;
+            }
+            this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units ] , "Changing", "timeline");
+        }
+    },
+
+    handleBlur:{
+        value:function(event){
+            this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [event.target.value] , "Change", "timeline");
+        }
+    },
+
         
         /* Begin: Logging routines */
     _boolDebug: {