diff options
author | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
commit | 936fbd6d76d35e3f9574983682c266de6dce55f7 (patch) | |
tree | edfbd366df9d7e7514425561a817fc2c67f398d9 /js/panels/css-panel | |
parent | 7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/css-panel')
-rw-r--r-- | js/panels/css-panel/styles-view-delegate.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index 6b80663a..113300b2 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js | |||
@@ -337,7 +337,8 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
337 | type : 'cssChange', | 337 | type : 'cssChange', |
338 | data: { | 338 | data: { |
339 | "prop": property, | 339 | "prop": property, |
340 | "value": value | 340 | "value": value, |
341 | "els": this.application.ninja.selectedElements | ||
341 | }, | 342 | }, |
342 | redraw: null | 343 | redraw: null |
343 | }); | 344 | }); |