diff options
-rw-r--r-- | client/components/boards/boardHeader.jade | 2 | ||||
-rw-r--r-- | client/components/import/import.jade | 4 | ||||
-rwxr-xr-x | client/components/main/editor.js | 20 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.jade | 2 | ||||
-rw-r--r-- | client/lib/popup.js | 2 | ||||
-rw-r--r-- | models/users.js | 1 |
6 files changed, 16 insertions, 15 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index e61831a1..03768b36 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -89,7 +89,7 @@ template(name="boardHeaderBar") span {{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}} if MultiSelection.isActive a.board-header-btn-close.js-multiselection-reset(title="{{_ 'filter-clear'}}") - i.fa.fa-times-thin + i.fa.fa-times-thin .separator a.board-header-btn.js-open-board-menu diff --git a/client/components/import/import.jade b/client/components/import/import.jade index e10072b4..d4def7d8 100644 --- a/client/components/import/import.jade +++ b/client/components/import/import.jade @@ -55,10 +55,10 @@ template(name="importMapMembersAddPopup") ul.pop-over-list +esEach(index="users") li.item.js-member-item - a.name.js-select-import(title="{{profile.name}} ({{username}})" data-id="{{_id}}") + a.name.js-select-import(title="{{profile.fullname}} ({{username}})" data-id="{{_id}}") +userAvatar(userId=_id esSearch=true) span.full-name - = profile.name + = profile.fullname | (<span class="username">{{username}}</span>) +ifEsIsSearching(index='users') +spinner diff --git a/client/components/main/editor.js b/client/components/main/editor.js index da66bb74..17429067 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -90,15 +90,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() { })); Template.viewer.events({ - 'click .js-open-member'(evt, tpl) { - const userId = evt.currentTarget.dataset.userid; - Popup.open('member').call({ userId }, evt, tpl); - }, - // Viewer sometimes have click-able wrapper around them (for instance to edit // the corresponding text). Clicking a link shouldn't fire these actions, stop // we stop these event at the viewer component level. - 'click a'(evt) { + 'click a'(evt, tpl) { evt.stopPropagation(); // XXX We hijack the build-in browser action because we currently don't have @@ -106,9 +101,16 @@ Template.viewer.events({ // handled by a third party package that we can't configure easily. Fix that // by using directly `_blank` attribute in the rendered HTML. evt.preventDefault(); - const href = evt.currentTarget.href; - if (href) { - window.open(href, '_blank'); + + const userId = evt.currentTarget.dataset.userid; + if (userId) { + Popup.open('member').call({ userId }, evt, tpl); + } + else { + const href = evt.currentTarget.href; + if (href) { + window.open(href, '_blank'); + } } }, }); diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index 893b5164..4f5586cb 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -102,7 +102,7 @@ template(name="addMemberPopup") ul.pop-over-list +esEach(index="users") li.item.js-member-item(class="{{#if isBoardMember}}disabled{{/if}}") - a.name.js-select-member(title="{{profile.name}} ({{username}})") + a.name.js-select-member(title="{{profile.fullname}} ({{username}})") +userAvatar(userId=_id esSearch=true) span.full-name = profile.fullname diff --git a/client/lib/popup.js b/client/lib/popup.js index 3166ca30..3658d883 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -75,7 +75,7 @@ window.Popup = new class { // If there are no popup currently opened we use the Blaze API to render // one into the DOM. We use a reactive function as the data parameter that - // return the the complete along with its top element and depends on our + // return the complete along with its top element and depends on our // internal dependency that is being invalidated every time the top // element of the stack has changed and we want to update the popup. // diff --git a/models/users.js b/models/users.js index a3bdb6f8..790ee0a1 100644 --- a/models/users.js +++ b/models/users.js @@ -411,7 +411,6 @@ if (Meteor.isServer) { ['welcome-list1', 'welcome-list2'].forEach((title) => { Lists.insert({ title: TAPi18n.__(title), boardId }, fakeUser); }); - }); }); }); |