diff options
author | Kruti Shah | 2012-05-22 15:32:42 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-22 15:32:42 -0700 |
commit | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (patch) | |
tree | 73542d12e12c7b2744bc6881aa995dc553575140 /js/panels/Timeline | |
parent | a1630e05c854d0ee20747dca61ea5a0328d1ea34 (diff) | |
download | ninja-fdc4f5c7f81ae3b9adeca2232e60268b4be594a2.tar.gz |
Style Layer Control
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index 91abaa71..532982f7 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -316,6 +316,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
316 | this.editorColorContainer.classList.add("hidden"); | 316 | this.editorColorContainer.classList.add("hidden"); |
317 | this.editorHottextContainer.classList.add("hidden"); | 317 | this.editorHottextContainer.classList.add("hidden"); |
318 | this.valueEditorInput.value = this.editorValue; | 318 | this.valueEditorInput.value = this.editorValue; |
319 | this.valueEditorInput.addEventListener("blur",this,false); | ||
319 | } else { | 320 | } else { |
320 | this.log("Warning: unknown tweenable -"+tweenable.tweener+"- specified in style.js.") | 321 | this.log("Warning: unknown tweenable -"+tweenable.tweener+"- specified in style.js.") |
321 | } | 322 | } |
@@ -559,7 +560,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
559 | { | 560 | { |
560 | "property" : "opacity", | 561 | "property" : "opacity", |
561 | "tweener" : "hottext", | 562 | "tweener" : "hottext", |
562 | "units" : "%", | 563 | "units" : "", |
563 | "min" : 0, | 564 | "min" : 0, |
564 | "max" : 100, | 565 | "max" : 100, |
565 | "default" : 100 | 566 | "default" : 100 |
@@ -617,19 +618,31 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
617 | }, | 618 | }, |
618 | 619 | ||
619 | handleHottextChange:{ | 620 | handleHottextChange:{ |
620 | value:function(){ | 621 | value:function(event){ |
621 | debugger; | 622 | |
622 | this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + "%"] , "Change", "timeline"); | 623 | if(this.editorValue===""){ |
624 | this.editorValue = 0; | ||
625 | } | ||
626 | this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline"); | ||
623 | } | 627 | } |
624 | }, | 628 | }, |
625 | 629 | ||
626 | handleHottextChanging:{ | 630 | handleHottextChanging:{ |
627 | value:function(){ | 631 | value:function(event){ |
632 | |||
633 | if(this.editorValue===""){ | ||
634 | this.editorValue = 0; | ||
635 | } | ||
636 | this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units ] , "Changing", "timeline"); | ||
637 | } | ||
638 | }, | ||
628 | 639 | ||
629 | debugger; | 640 | handleBlur:{ |
630 | this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + "%"] , "Changing", "timeline"); | 641 | value:function(event){ |
642 | this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [event.target.value] , "Change", "timeline"); | ||
631 | } | 643 | } |
632 | }, | 644 | }, |
645 | |||
633 | 646 | ||
634 | /* Begin: Logging routines */ | 647 | /* Begin: Logging routines */ |
635 | _boolDebug: { | 648 | _boolDebug: { |