aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-28 09:50:28 -0700
committerJose Antonio Marquez2012-06-28 09:50:28 -0700
commitee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/Timeline/Style.reel/Style.js
parentca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.js')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index fe8d04e9..c8d323a9 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -400,8 +400,10 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
400 var currentValue = ElementsMediator.getColor(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement,this._isFill,this._borderSide) 400 var currentValue = ElementsMediator.getColor(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement,this._isFill,this._borderSide)
401 this.application.ninja.timeline.selectedStyle = this.editorProperty; 401 this.application.ninja.timeline.selectedStyle = this.editorProperty;
402 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); 402 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false);
403 this._fillColorCtrl.color(currentValue.colorMode, currentValue.color); 403 if(currentValue){
404 this.addedColorChips = true; 404 this._fillColorCtrl.color(currentValue.colorMode, currentValue.color);
405 this.addedColorChips = true;
406 }
405 } 407 }
406 // TODO: set up color chip here. 408 // TODO: set up color chip here.
407 } else if (tweenable.tweener === "input"){ 409 } else if (tweenable.tweener === "input"){