aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js18
-rw-r--r--js/panels/Timeline/Style.reel/Style.js10
2 files changed, 14 insertions, 14 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index a96b206f..cbc001be 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -891,56 +891,56 @@ var Layer = exports.Layer = Montage.create(Component, {
891 891
892 handleLeftChange:{ 892 handleLeftChange:{
893 value:function(){ 893 value:function(){
894 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "left", [this.dtextPositionX + "px"] , "Change", "timeline"); 894 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "left", [this.dtextPositionX + "px"] , "Change", "timeline");
895 } 895 }
896 }, 896 },
897 897
898 handleTopChange:{ 898 handleTopChange:{
899 value:function(){ 899 value:function(){
900 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "top", [this.dtextPositionY + "px"] , "Change", "timeline"); 900 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "top", [this.dtextPositionY + "px"] , "Change", "timeline");
901 } 901 }
902 }, 902 },
903 903
904 handleWidthChange:{ 904 handleWidthChange:{
905 value:function(){ 905 value:function(){
906 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "width", [this.dtextScaleX + "px"] , "Change", "timeline"); 906 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "width", [this.dtextScaleX + "px"] , "Change", "timeline");
907 } 907 }
908 }, 908 },
909 909
910 handleHeightChange:{ 910 handleHeightChange:{
911 value:function(){ 911 value:function(){
912 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "height", [this.dtextScaleY + "px"] , "Change", "timeline"); 912 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "height", [this.dtextScaleY + "px"] , "Change", "timeline");
913 } 913 }
914 }, 914 },
915 915
916 handleLeftChanging:{ 916 handleLeftChanging:{
917 value:function(){ 917 value:function(){
918 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "left", [this.dtextPositionX + "px"] , "Changing", "timeline"); 918 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "left", [this.dtextPositionX + "px"] , "Changing", "timeline");
919 } 919 }
920 }, 920 },
921 921
922 handleTopChanging:{ 922 handleTopChanging:{
923 value:function(){ 923 value:function(){
924 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "top", [this.dtextPositionY + "px"] , "Changing", "timeline"); 924 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "top", [this.dtextPositionY + "px"] , "Changing", "timeline");
925 } 925 }
926 }, 926 },
927 927
928 handleWidthChanging:{ 928 handleWidthChanging:{
929 value:function(){ 929 value:function(){
930 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "width", [this.dtextScaleX + "px"] , "Changing", "timeline"); 930 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "width", [this.dtextScaleX + "px"] , "Changing", "timeline");
931 } 931 }
932 }, 932 },
933 933
934 handleHeightChanging:{ 934 handleHeightChanging:{
935 value:function(){ 935 value:function(){
936 this.application.ninja.elementMediator.setProperty(this.layerData.elementsList, "height", [this.dtextScaleY + "px"] , "Changing", "timeline"); 936 this.application.ninja.elementMediator.setProperty([this.layerData.stageElement], "height", [this.dtextScaleY + "px"] , "Changing", "timeline");
937 } 937 }
938 }, 938 },
939 939
940 940
941 handleElementChange:{ 941 handleElementChange:{
942 value:function(event){ 942 value:function(event){
943 var el = this.layerData.elementsList[0]; 943 var el =this.layerData.stageElement;
944 var length = this.arrLayerStyles.length , i; 944 var length = this.arrLayerStyles.length , i;
945 945
946 if(event.detail.source && event.detail.source!== "timeline"){ 946 if(event.detail.source && event.detail.source!== "timeline"){
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 102e9f25..9209e8b9 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -691,12 +691,12 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
691 691
692 handleFillColorChange: { 692 handleFillColorChange: {
693 value: function (event) { 693 value: function (event) {
694debugger;
695 694
696 var fillColorObject={}; 695 var fillColorObject={};
697 fillColorObject.color=event._event.color; 696 fillColorObject.color=event._event.color;
698 fillColorObject.mode=event._event.colorMode; 697 fillColorObject.mode=event._event.colorMode;
699 ElementsMediator.setColor(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) 698 console.log(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement);
699 ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide)
700 } 700 }
701 }, 701 },
702 702
@@ -706,7 +706,7 @@ debugger;
706 if(this.editorValue===""){ 706 if(this.editorValue===""){
707 this.editorValue = 0; 707 this.editorValue = 0;
708 } 708 }
709 this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline"); 709 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline");
710 } 710 }
711 }, 711 },
712 712
@@ -716,13 +716,13 @@ debugger;
716 if(this.editorValue===""){ 716 if(this.editorValue===""){
717 this.editorValue = 0; 717 this.editorValue = 0;
718 } 718 }
719 this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [this.editorValue + event.target._units ] , "Changing", "timeline"); 719 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units ] , "Changing", "timeline");
720 } 720 }
721 }, 721 },
722 722
723 handleBlur:{ 723 handleBlur:{
724 value:function(event){ 724 value:function(event){
725 this.application.ninja.elementMediator.setProperty(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.elementsList, this.editorProperty, [event.target.value] , "Change", "timeline"); 725 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [event.target.value] , "Change", "timeline");
726 } 726 }
727 }, 727 },
728 728