From 4a8a293ba3fdf934a431152a9351f45092fb3695 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 25 May 2012 14:01:45 -0700 Subject: Timeline: bug fix: better selection/deselection of styles within layers. --- js/panels/Timeline/Style.reel/Style.js | 5 +++-- js/panels/Timeline/Style.reel/scss/Style.scss | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'js/panels/Timeline/Style.reel') diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index c39f3a56..d712f2bd 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js @@ -35,6 +35,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { return this._isSelected; }, set: function(newVal) { + console.log("Style["+this.styleID+"].isSelected.set ", newVal) if (newVal !== this._isSelected) { this._isSelected = newVal; this.needsDraw = true; @@ -191,9 +192,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { this._showView(); } if (this.isSelected) { - this.element.classList.add("selected"); + this.element.classList.add("style-selected"); } else { - this.element.classList.remove("selected"); + this.element.classList.remove("style-selected"); } } }, diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 66028cbe..3ea943d8 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -77,3 +77,7 @@ div.style-row .container-propvals { overflow: hidden; } +.content-style .style-row.style-selected { + //background-color: red !important; +} + -- cgit v1.2.3