Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index a684d0db..dd786d15 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -82,7 +82,11 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
                 // This is a single chip - Not related to the color panel -- Set the initial color if found
                 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
 
-                if(this.color) {
+                if(this.color && this.color.color) {
+                        var g =  this.color.color;
+                        g.wasSetByCode = true;
+                        this.chipBtn.color(this.color.mode, g);
+                } else if (this.color) {
                     var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
                     mode = colorObj.mode;
                     r = colorObj.value.r;