3 files changed, 379 insertions, 292 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 77db9b64..a96b206f 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -625,6 +625,7 @@ var Layer = exports.Layer = Montage.create(Component, {
                 newStyle.editorProperty = styleProperty;
                 newEvent.layerEventType = "restoreStyle";
                 newEvent.trackEditorProperty = styleProperty;
+                newEvent.trackEditorProperty = styleProperty;
             }
                         newStyle.editorValue = "";
                         newStyle.ruleTweener = false;
@@ -744,6 +745,7 @@ var Layer = exports.Layer = Montage.create(Component, {
                         this.triggerOutgoingBinding();
 
                         this.addStyle();
+
                 }
         },
         handleDeleteStyleClick: {
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 5be159c3..cdc355e7 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -19,7 +19,8 @@
                         "styleProperty" : {"#": "container-property"},
                         "valueEditorHottext" : {"@":"hottextunit"},
                         "dtextProperty" : {"@":"dtext1"},
-                        "myHintable" : {"@" :"hintable"}
+                        "myHintable" : {"@" :"hintable"},
+                        "_fillColorCtrl": {"#": "fillColorCtrl"}
                     }
                 },
                     "dtext1" : {
@@ -78,7 +79,9 @@
                                                 <div data-montage-id="value-editor-hottext"></div>
                                         </div>
                                         <div class="cell-value value-editor editor-color hidden">
-                                                <div data-montage-id="value-editor-color">[&nbsp;]</div>
+                                                <div data-montage-id="value-editor-color">
+                            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+                                                </div>
                                         </div>
                                         <div class="cell-value value-editor editor-input hidden">
                                                 <!-- <div data-montage-id="value-editor-input"></div> -->
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index fa848cc0..102e9f25 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -17,6 +17,8 @@
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
+var ElementsMediator =          require("js/mediators/element-mediator").ElementMediator
+
 
 var LayerStyle = exports.LayerStyle = Montage.create(Component, {
 
@@ -169,7 +171,27 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                         this.needsDraw = true;
                 }
         },
-        
+
+    addedColorChips:
+        { value: false },
+
+    _fill: {
+        enumerable: false,
+        value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] }
+    },
+
+    fill: {
+        enumerable: true,
+        get: function () {
+            return this._fill;
+        },
+        set: function (value) {
+            if (value !== this._fill) {
+                this._fill = value;
+            }
+        }
+    },
+
         handleMousedown: {
                 value: function(event) {
                         this.isActive = true;
@@ -196,6 +218,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                 } else {
                         this.element.classList.remove("style-selected");
                 }
+
+
         }
     },
     didDraw: {
@@ -311,6 +335,38 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                                 this.editorInputContainer.classList.add("hidden");
                                 this.editorColorContainer.classList.remove("hidden");
                                 this.editorHottextContainer.classList.add("hidden");
+
+                if(tweenable.colorType === "fill"){
+                                    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;
+                }
+
+                if (this.addedColorChips) {
+                    this._fillColorCtrl.color(this._fill.colorMode, this._fill.color);
+    //                this._strokeColorCtrl.color(this._stroke.colorMode, this._stroke.color);
+                }
+
+
+
                                 // TODO: set up color chip here.
                         } else if (tweenable.tweener === "input"){
                                 this.editorInputContainer.classList.remove("hidden");
@@ -327,295 +383,321 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
         /* === END: Controllers === */
     
     _myTweenables: {
-        value: [
-                {
-                        "property" : "background-color",
-                        "tweener" : "color",
-                        "units" : "",
-                        "min" : "",
-                        "max" : "",
-                        "default" :"#FFFFFF"
-                },
-                {
-                        "property" : "background-position-x",
-                        "tweener" : "hottext",
-                        "units" : "px",
-                        "min" : -9999,
-                        "max" : 9999,
-                        "default" : 0
-                },
-                {
-                        "property" : "background-position-y",
-                        "tweener" : "hottext",
-                        "units" : "px",
-                        "min" : -9999,
-                        "max" : 9999,
-                        "default" : 0
-                },
-                {
-                        "property" : "border-color",
-                        "tweener" : "color",
-                        "units" : "",
-                        "min" : "",
-                        "max" : "",
-                        "default" : "#FFFFFF"
-                },
-                {
-                        "property" : "border-width",
-                        "tweener" : "hottext",
-                        "units" : "px",
-                        "min" : 0,
-                        "max" : 9999,
-                        "default" : 0
-                },
-                {
-                        "property" : "border-bottom-color",
+        value: [
+            {
+                "property" : "background-color",
+                "tweener" : "color",
+                "units" : "",
+                "min" : "",
+                "max" : "",
+                "default" :"#FFFFFF",
+                "colorType" :"fill"
+            },
+            {
+                "property" : "background-position-x",
+                "tweener" : "hottext",
+                "units" : "px",
+                "min" : -9999,
+                "max" : 9999,
+                "default" : 0
+            },
+            {
+                "property" : "background-position-y",
+                "tweener" : "hottext",
+                "units" : "px",
+                "min" : -9999,
+                "max" : 9999,
+                "default" : 0
+            },
+            {
+                "property" : "border-color",
+                "tweener" : "color",
+                "units" : "",
+                "min" : "",
+                "max" : "",
+                "default" : "#FFFFFF",
+                "colorType" : "stroke",
+                "strokePosition" : false
+            },
+            {
+                "property" : "border-width",
+                "tweener" : "hottext",
+                "units" : "px",
+                "min" : 0,
+                "max" : 9999,
+                "default" : 0