diff options
| author | Jonathan Duran | 2012-06-22 01:36:10 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-22 01:36:10 -0700 |
| commit | 020ad879a627c4234a8732f05e175ad69cedf180 (patch) | |
| tree | 743ea0d3a3af9cae65d5af531a6dba1951b03b33 /js/panels | |
| parent | 04f206173530b6efde16b934b1f959b255d18441 (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-020ad879a627c4234a8732f05e175ad69cedf180.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix
Diffstat (limited to 'js/panels')
| -rw-r--r-- | js/panels/css-panel/styles-view-container.reel/styles-view-container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js index 153e74b6..975ae608 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js | |||
| @@ -129,7 +129,7 @@ exports.StylesViewContainer = Montage.create(Component, { | |||
| 129 | } | 129 | } |
| 130 | }, | 130 | }, |
| 131 | handleSelectionChange: { | 131 | handleSelectionChange: { |
| 132 | value: function() { | 132 | value: function(e) { |
| 133 | var elements = this.application.ninja.selectedElements, | 133 | var elements = this.application.ninja.selectedElements, |
| 134 | elementsCopy = this._copy(elements); | 134 | elementsCopy = this._copy(elements); |
| 135 | 135 | ||