diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 3 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index f450dd8a..ba6952aa 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -60,10 +60,8 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
60 | if(this.isSelected){ | 60 | if(this.isSelected){ |
61 | this.element.classList.add("keyframeSelected"); | 61 | this.element.classList.add("keyframeSelected"); |
62 | this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty; | 62 | this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty; |
63 | console.log(this.application.ninja.timeline.selectedStyle) | ||
64 | }else{ | 63 | }else{ |
65 | this.element.classList.remove("keyframeSelected"); | 64 | this.element.classList.remove("keyframeSelected"); |
66 | this.application.ninja.timeline.selectedStyle = !(this.parentComponent.parentComponent.parentComponent.trackEditorProperty); | ||
67 | } | 65 | } |
68 | this.element.style.left = (this.position - 5) + "px"; | 66 | this.element.style.left = (this.position - 5) + "px"; |
69 | } | 67 | } |
@@ -73,7 +71,6 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
73 | value:function(){ | 71 | value:function(){ |
74 | this.isSelected=false; | 72 | this.isSelected=false; |
75 | this.element.style.left = (this.position - 5) + "px"; | 73 | this.element.style.left = (this.position - 5) + "px"; |
76 | this.application.ninja.timeline.selectedStyle = !(this.parentComponent.parentComponent.parentComponent.trackEditorProperty) | ||
77 | } | 74 | } |
78 | }, | 75 | }, |
79 | 76 | ||
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index bb10f30f..03d674a5 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -705,19 +705,17 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
705 | 705 | ||
706 | handleFillColorChange: { | 706 | handleFillColorChange: { |
707 | value: function (event) { | 707 | value: function (event) { |
708 | 708 | if(this.application.ninja.timeline.selectedStyle === "color" ||this.application.ninja.timeline.selectedStyle === this.editorProperty){ | |
709 | if(this.application.ninja.timeline.selectedStyle === "color" ||this.application.ninja.timeline.selectedStyle === this.editorProperty){ | ||
710 | var fillColorObject={}; | 709 | var fillColorObject={}; |
711 | fillColorObject.color=event._event.color; | 710 | fillColorObject.color=event._event.color; |
712 | fillColorObject.mode=event._event.colorMode; | 711 | fillColorObject.mode=event._event.colorMode; |
713 | ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) | 712 | ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) |
714 | } | 713 | } |
715 | } | 714 | } |
716 | }, | 715 | }, |
717 | 716 | ||
718 | handleHottextChange:{ | 717 | handleHottextChange:{ |
719 | value:function(event){ | 718 | value:function(event){ |
720 | console.log(this.application.ninja.timeline.selectedStyle) | ||
721 | if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ | 719 | if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ |
722 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline"); | 720 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline"); |
723 | } | 721 | } |
@@ -726,7 +724,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
726 | 724 | ||
727 | handleHottextChanging:{ | 725 | handleHottextChanging:{ |
728 | value:function(event){ | 726 | value:function(event){ |
729 | console.log(this.application.ninja.timeline.selectedStyle) | ||
730 | if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ | 727 | if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ |
731 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Changing", "timeline"); | 728 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Changing", "timeline"); |
732 | } | 729 | } |