From 7887aafbff794e9c5f918c667e73a8386c38cf02 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 12 Jun 2012 13:18:02 -0700 Subject: Clean up Signed-off-by: Kruti Shah --- js/panels/Timeline/Keyframe.reel/Keyframe.js | 3 --- js/panels/Timeline/Style.reel/Style.js | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'js/panels/Timeline') 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, { if(this.isSelected){ this.element.classList.add("keyframeSelected"); this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty; - console.log(this.application.ninja.timeline.selectedStyle) }else{ this.element.classList.remove("keyframeSelected"); - this.application.ninja.timeline.selectedStyle = !(this.parentComponent.parentComponent.parentComponent.trackEditorProperty); } this.element.style.left = (this.position - 5) + "px"; } @@ -73,7 +71,6 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { value:function(){ this.isSelected=false; this.element.style.left = (this.position - 5) + "px"; - this.application.ninja.timeline.selectedStyle = !(this.parentComponent.parentComponent.parentComponent.trackEditorProperty) } }, 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, { handleFillColorChange: { value: function (event) { - - if(this.application.ninja.timeline.selectedStyle === "color" ||this.application.ninja.timeline.selectedStyle === this.editorProperty){ + if(this.application.ninja.timeline.selectedStyle === "color" ||this.application.ninja.timeline.selectedStyle === this.editorProperty){ var fillColorObject={}; fillColorObject.color=event._event.color; fillColorObject.mode=event._event.colorMode; ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) - } + } } }, handleHottextChange:{ value:function(event){ - console.log(this.application.ninja.timeline.selectedStyle) if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Change", "timeline"); } @@ -726,7 +724,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { handleHottextChanging:{ value:function(event){ - console.log(this.application.ninja.timeline.selectedStyle) if(this.application.ninja.timeline.selectedStyle === this.editorProperty){ this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], this.editorProperty, [this.editorValue + event.target._units] , "Changing", "timeline"); } -- cgit v1.2.3