summaryrefslogtreecommitdiffstats
path: root/client/components/sidebar/sidebar.js
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-10-23 03:38:38 +0200
committerXavier Priour <xavier.priour@bubblyware.com>2015-10-23 03:38:38 +0200
commit658ef5ebe112edd55eb8cf160e02a46eb2e13afd (patch)
tree91991e142582b1ae71f5369a8ef9c202908ba8c2 /client/components/sidebar/sidebar.js
parent027aacb50e2baf715c89d914e34132458cf11691 (diff)
parentb3696e1e3b366770af8c41861b5cf996cdd2378a (diff)
downloadwekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.gz
wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.bz2
wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.zip
Merge branch 'devel' into feature/import-board-members
Diffstat (limited to 'client/components/sidebar/sidebar.js')
-rw-r--r--client/components/sidebar/sidebar.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index 72866055..ccb9f2f5 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -95,10 +95,10 @@ BlazeComponent.extendComponent({
events() {
// XXX Hacky, we need some kind of `super`
const mixinEvents = this.getMixin(Mixins.InfiniteScrolling).events();
- return mixinEvents.concat([{
+ return [...mixinEvents, {
'click .js-toggle-sidebar': this.toggle,
'click .js-back-home': this.setView,
- }]);
+ }];
},
}).register('sidebar');