From e4c12f183f001cb9c051131dda7f5bddbe5b1619 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Fri, 1 Jun 2012 11:00:34 -0700 Subject: Clean up Signed-off-by: Kruti Shah --- js/panels/Timeline/Style.reel/Style.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'js') diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index 9209e8b9..669091af 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js @@ -337,26 +337,19 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { this.editorHottextContainer.classList.add("hidden"); if(tweenable.colorType === "fill"){ - this._isFill = true; - }else{ - if(tweenable.colorType === "stroke"){ - this._isFill = false; - this._borderSide = tweenable.strokePosition - } - - } + this._isFill = true; + }else{ + if(tweenable.colorType === "stroke"){ + this._isFill = false; + this._borderSide = tweenable.strokePosition + } + } if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { // setup fill color this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); - - // setup stroke color - // this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; - // this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); - this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); - this.addedColorChips = true; } @@ -695,7 +688,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { var fillColorObject={}; fillColorObject.color=event._event.color; fillColorObject.mode=event._event.colorMode; - console.log(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement); ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) } }, -- cgit v1.2.3