[FIX] Mentions message missing 'jump to message' action (#14430)

* fixed context

* threads context
pull/14422/head^2
Guilherme Gazzo 6 years ago committed by GitHub
parent 10ff75cbd0
commit e9d6611aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/mentions-flextab/client/views/mentionsFlexTab.html
  2. 3
      app/mentions-flextab/client/views/mentionsFlexTab.js
  3. 2
      app/threads/client/flextab/thread.html
  4. 8
      app/ui-message/client/message.js

@ -9,7 +9,7 @@
<div class="flex-tab__result js-list">
<ul class="mentioned-messages-list list clearfix">
{{# with messageContext}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u customClass="mentions" context="mentions"}}{{/nrr}}{{/each}}
{{/with}}
</ul>
{{#if hasMore}}

@ -10,9 +10,6 @@ Template.mentionsFlexTab.helpers({
messages() {
return Template.instance().cursor;
},
message() {
return _.extend(this, { customClass: 'mentions', actionContext: 'mentions' });
},
hasMore() {
return Template.instance().hasMore.get();
},

@ -23,7 +23,7 @@
{{else}}
{{> message groupable=false hideRoles=true msg=mainMessage room=room subscription=subscription settings=settings customClass="thread-message" templatePrefix='thread-' customClass="thread-main" u=u}}
{{#each msg in messages}}
{{> message hideRoles=true msg=msg room=room subscription=subscription settings=settings templatePrefix='thread-' u=u}}
{{> message hideRoles=true msg=msg room=room subscription=subscription settings=settings templatePrefix='thread-' u=u context="threads"}}
{{/each}}
{{/if}}
{{/with}}

@ -374,9 +374,13 @@ Template.message.helpers({
}
return roomTypes.getIcon(room);
},
customClass() {
const { customClass, msg } = this;
return customClass || msg.customClass;
},
fromSearch() {
const { customClass } = this;
return customClass === 'search';
const { customClass, msg } = this;
return [msg.customClass, customClass].includes('search');
},
actionContext() {
const { msg } = this;

Loading…
Cancel
Save