diff options
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 22 |
1 files changed, 7 insertions, 15 deletions
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, { | |||
337 | this.editorHottextContainer.classList.add("hidden"); | 337 | this.editorHottextContainer.classList.add("hidden"); |
338 | 338 | ||
339 | if(tweenable.colorType === "fill"){ | 339 | if(tweenable.colorType === "fill"){ |
340 | this._isFill = true; | 340 | this._isFill = true; |
341 | }else{ | 341 | }else{ |
342 | if(tweenable.colorType === "stroke"){ | 342 | if(tweenable.colorType === "stroke"){ |
343 | this._isFill = false; | 343 | this._isFill = false; |
344 | this._borderSide = tweenable.strokePosition | 344 | this._borderSide = tweenable.strokePosition |
345 | } | 345 | } |
346 | 346 | } | |
347 | } | ||
348 | 347 | ||
349 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 348 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
350 | // setup fill color | 349 | // setup fill color |
351 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 350 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; |
352 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 351 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
353 | |||
354 | // setup stroke color | ||
355 | // this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | ||
356 | // this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); | ||
357 | |||
358 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 352 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |
359 | |||
360 | this.addedColorChips = true; | 353 | this.addedColorChips = true; |
361 | } | 354 | } |
362 | 355 | ||
@@ -695,7 +688,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
695 | var fillColorObject={}; | 688 | var fillColorObject={}; |
696 | fillColorObject.color=event._event.color; | 689 | fillColorObject.color=event._event.color; |
697 | fillColorObject.mode=event._event.colorMode; | 690 | fillColorObject.mode=event._event.colorMode; |
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) | 691 | ElementsMediator.setColor([this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement], fillColorObject, this._isFill, "Change", "timeline",null,this._borderSide) |
700 | } | 692 | } |
701 | }, | 693 | }, |