diff options
author | Xavier Priour <xavier.priour@bubblyware.com> | 2015-10-23 03:38:38 +0200 |
---|---|---|
committer | Xavier Priour <xavier.priour@bubblyware.com> | 2015-10-23 03:38:38 +0200 |
commit | 658ef5ebe112edd55eb8cf160e02a46eb2e13afd (patch) | |
tree | 91991e142582b1ae71f5369a8ef9c202908ba8c2 /client/components | |
parent | 027aacb50e2baf715c89d914e34132458cf11691 (diff) | |
parent | b3696e1e3b366770af8c41861b5cf996cdd2378a (diff) | |
download | wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.gz wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.bz2 wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.zip |
Merge branch 'devel' into feature/import-board-members
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/cards/cardDetails.js | 5 | ||||
-rw-r--r-- | client/components/cards/labels.js | 2 | ||||
-rw-r--r-- | client/components/main/editor.js | 2 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 4 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 5e07abab..2d2679ec 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -62,7 +62,8 @@ BlazeComponent.extendComponent({ }, }; - return [_.extend(events, { + return [{ + ...events, 'click .js-close-card-details'() { Utils.goBoardId(this.data().boardId); }, @@ -86,7 +87,7 @@ BlazeComponent.extendComponent({ this.parentComponent().showOverlay.set(true); this.parentComponent().mouseHasEnterCardDetails = true; }, - })]; + }]; }, }).register('cardDetails'); diff --git a/client/components/cards/labels.js b/client/components/cards/labels.js index 6a411561..4e61a0c6 100644 --- a/client/components/cards/labels.js +++ b/client/components/cards/labels.js @@ -13,7 +13,7 @@ BlazeComponent.extendComponent({ }, labels() { - return _.map(labelColors, (color) => { + return labelColors.map((color) => { return { color, name: '' }; }); }, diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 67b65bec..168c85d0 100644 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -54,7 +54,7 @@ const at = HTML.CharRef({html: '@', str: '@'}); Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); - const knowedUsers = _.map(currentBoard.members, (member) => { + const knowedUsers = currentBoard.members.map((member) => { member.username = Users.findOne(member.userId).username; return member; }); 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'); diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 0f91fd15..a7382769 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -41,7 +41,7 @@ Template.changePasswordPopup.onRendered(function() { Template.changeLanguagePopup.helpers({ languages() { - return _.map(TAPi18n.getLanguages(), (lang, tag) => { + return TAPi18n.getLanguages().map((lang, tag) => { const name = lang.name; return { tag, name }; }); |