Skip to content

Rcint 8181 #978

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
merged 11 commits into from
Aug 1, 2018
Merged

Rcint 8181 #978

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
92af649
sync from upstream (#16)
ruleechen May 27, 2018
3a6a4c7
bug fixes rcint-7712
Jul 24, 2018
c74338c
Merge branch 'master' of github.com:ringcentral/ringcentral-js-widgets
Jul 24, 2018
466823a
code specification
Jul 24, 2018
a9e7fbc
refactor the lastcallend func
Jul 24, 2018
78be614
eslinted
Jul 24, 2018
410e5e9
Merge branch 'master' of github.com:ringcentral/ringcentral-js-widgets
Jul 26, 2018
da552d2
Merge branch 'master' of github.com:ringcentral/ringcentral-js-widgets
jarvislin94 Jul 28, 2018
4d13685
Merge branch 'master' of github.com:ringcentral/ringcentral-js-widgets
jarvislin94 Aug 1, 2018
e081991
:arrow_up: (code async) code async
jarvislin94 Aug 1, 2018
8a0136b
:bug: (rcint-8181) hover on the name should display the tooltip
jarvislin94 Aug 1, 2018
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
10 changes: 5 additions & 5 deletions packages/ringcentral-widgets/components/ActiveCallPanel/MergeInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ class MergeInfo extends Component {
</div>
<div className={styles.callee_name}>
{
isOnConferenCall
? i18n.getString('conferenceCall', currentLocale)
: calleeName
}
isOnConferenCall
? <span title={i18n.getString('conferenceCall', currentLocale)}>{i18n.getString('conferenceCall', currentLocale)} </span>
: <span title={calleeName}>{calleeName}</span>
}
</div>
<div className={statusClasses}>
{lastCallInfo.status === sessionStatus.finished
Expand All @@ -91,7 +91,7 @@ class MergeInfo extends Component {
}
</div>
<div className={styles.callee_name_active}>
{currentCallTitle}
<span title={currentCallTitle}>{currentCallTitle}</span>
</div>
<div className={styles.callee_status_active}>
{timeCounter}
Expand Down