diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /js/panels/css-panel | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'js/panels/css-panel')
| -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 | ||