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, 5 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f7cd40ca..29bf6eb3 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -98,6 +98,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
                                         "oneway" : false
                                 },
+                                "isActive" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
+                                        "oneway" : false
+                                },
                                 "isStyleCollapsed" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",