aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-25 14:01:45 -0700
committerJon Reid2012-05-25 14:01:45 -0700
commit4a8a293ba3fdf934a431152a9351f45092fb3695 (patch)
tree53d5c31b86f6f4ba29f813fbe44c9dbb34c78bf4 /js/panels/Timeline/Style.reel
parentb0a736deb4f3bb515e0ca4009fe4f98e22cec2c0 (diff)
downloadninja-4a8a293ba3fdf934a431152a9351f45092fb3695.tar.gz
Timeline: bug fix: better selection/deselection of styles within layers.
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js5
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss4
2 files changed, 7 insertions, 2 deletions
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, {
35 return this._isSelected; 35 return this._isSelected;
36 }, 36 },
37 set: function(newVal) { 37 set: function(newVal) {
38 console.log("Style["+this.styleID+"].isSelected.set ", newVal)
38 if (newVal !== this._isSelected) { 39 if (newVal !== this._isSelected) {
39 this._isSelected = newVal; 40 this._isSelected = newVal;
40 this.needsDraw = true; 41 this.needsDraw = true;
@@ -191,9 +192,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
191 this._showView(); 192 this._showView();
192 } 193 }
193 if (this.isSelected) { 194 if (this.isSelected) {
194 this.element.classList.add("selected"); 195 this.element.classList.add("style-selected");
195 } else { 196 } else {
196 this.element.classList.remove("selected"); 197 this.element.classList.remove("style-selected");
197 } 198 }
198 } 199 }
199 }, 200 },
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 {
77 overflow: hidden; 77 overflow: hidden;
78} 78}
79 79
80.content-style .style-row.style-selected {
81 //background-color: red !important;
82}
83