Squashed commit of the following:

commit 46292bddbfbe7415c6852142dd10fd02a276722a
Author: Jon Reid <tjh487@motorola.com>
Date:   Wed Feb 8 14:32:22 2012 -0800

    Timeline: turn off console logging.

commit b8de88393182bc6e819c3d6a290ade2f804236ac
Merge: e651344 37b952c
Author: Jon Reid <tjh487@motorola.com>
Date:   Wed Feb 8 14:10:06 2012 -0800

    Merge branch 'Timeline-jduran' into Timeline-jreid

commit e651344d5d6c2911b31a54510c65a349c4d52db2
Author: Jon Reid <tjh487@motorola.com>
Date:   Wed Feb 8 14:08:25 2012 -0800

    Timeline: Bug fixes

    IKNINJA-947: Weird behavior with adding layers with an empty layer name selected
    IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers
    IKNINJA-1063: Styles can be added while style column is collapsed
    IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index bf254795..e6e03901 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -36,6 +36,21 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                         }
                 }
         },
+        
+    /* isActive:  Whether or not the user is actively clicking within the style; used to communicate state with
+     * parent Layer.
+     */
+    _isActive: {
+        value: false
+    },
+    isActive: {
+        get: function() {
+                return this._isActive;
+        },
+        set: function(newVal) {
+                this._isActive = newVal;
+        }
+    },
    
    // Property for this editor
     _editorProperty: {
@@ -153,6 +168,12 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                         this.needsDraw = true;
                 }
         },
+        
+        handleMousedown: {
+                value: function(event) {
+                        this.isActive = true;
+                }
+        },
     
     /* === END: Models === */
     
@@ -238,6 +259,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                         this.containerPropvals = this.element.querySelector(".container-propvals");
                         this.valueEditorInput = this.element.querySelector(".editor-input input");
                 
+                // mousedown listener to handle 
+                this.element.addEventListener("mousedown", this, false);
                 }
         },