Skip to content

Use main message as thread tab title #14213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 2 commits into from
Apr 22, 2019
Merged

Use main message as thread tab title #14213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35a2012
Use main message as thread tab title
tassoevan Apr 22, 2019
95ec4c9
Remove room name from thread tab title
tassoevan Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/theme/client/imports/components/contextual-bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@

&-data {
display: flex;
overflow: hidden;
flex: 1 1;
align-items: center;
}

&-icon {

flex: 0 0 auto;

margin: 0 0.25rem;

font-size: 22px;
Expand All @@ -80,10 +84,15 @@
}

&-title {

overflow: hidden;
flex: 1;

margin: 0 0.25rem;

white-space: nowrap;
text-overflow: ellipsis;

font-size: 16px;
font-weight: 400;
}
Expand Down
5 changes: 3 additions & 2 deletions app/threads/client/flextab/thread.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<header class="contextual-bar__header">
<div class="contextual-bar__header-data">
{{> icon block="contextual-bar__header-icon" icon='thread'}}
<h2 class="contextual-bar__header-title">{{_ 'Thread'}}
<sub class="contextual-bar__header-description">{{ room.fname }}</sub>
<h2 class="contextual-bar__header-title">
<span class="message-body--unstyled">{{threadTitle}}</span>
{{!-- <sub class="contextual-bar__header-description">{{room.fname}}</sub> --}}
</h2>
</div>
<button class="contextual-bar__header-close js-close">
Expand Down
11 changes: 5 additions & 6 deletions app/threads/client/flextab/thread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import _ from 'underscore';
import { Mongo } from 'meteor/mongo';
import { Template } from 'meteor/templating';
import { ReactiveDict } from 'meteor/reactive-dict';
import { Tracker } from 'meteor/tracker';

import _ from 'underscore';

import { ChatMessages } from '../../../ui';
import { call } from '../../../ui-utils';
import { normalizeThreadMessage, call } from '../../../ui-utils/client';
import { messageContext } from '../../../ui-utils/client/lib/messageContext';
import { Messages } from '../../../models';
import { lazyloadtick } from '../../../lazy-load';

import { upsert } from '../upsert';

import './thread.html';

const sort = { ts: 1 };
Expand All @@ -31,6 +27,9 @@ Template.thread.events({
});

Template.thread.helpers({
threadTitle() {
return normalizeThreadMessage(Template.currentData().mainMessage);
},
mainMessage() {
return Template.parentData().mainMessage;
},
Expand Down