From b64821534abbbf9e0cc44f5c84da1e37a14d756b Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 26 Jun 2012 10:18:21 -0700 Subject: BugFix - Color Chip Positioning & Checking for null value of the current color Signed-off-by: Kruti Shah --- js/panels/Timeline/Style.reel/Style.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/panels/Timeline/Style.reel/Style.js') 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, { var currentValue = ElementsMediator.getColor(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement,this._isFill,this._borderSide) this.application.ninja.timeline.selectedStyle = this.editorProperty; this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); - this._fillColorCtrl.color(currentValue.colorMode, currentValue.color); - this.addedColorChips = true; + if(currentValue){ + this._fillColorCtrl.color(currentValue.colorMode, currentValue.color); + this.addedColorChips = true; + } } // TODO: set up color chip here. } else if (tweenable.tweener === "input"){ -- cgit v1.2.3