corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1102170 - Share a room url by email when Loop direct call fails. r=Standard8

Browse Source
This commit is contained in:
Nicolas Perriault
2014-12-10 22:51:53 +01:00
parent 7bc0d31266
commit 916993ead5
7 changed files with 120 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
browser/components/loop/content/js/conversationViews.js
View File

@@ -27,6 +27,13 @@ loop.conversationViews = (function(mozL10n) {
return contact.email.find(e => e.pref) || contact.email[0];
}
function _getContactDisplayName(contact) {
if (contact.name && contact.name[0]) {
return contact.name[0];
}
return _getPreferredEmail(contact).value;
}
/**
* Displays information about the call
* Caller avatar, name & conversation creation date
@@ -107,14 +114,7 @@ loop.conversationViews = (function(mozL10n) {
},
render: function() {
var contactName;
if (this.props.contact.name &&
this.props.contact.name[0]) {
contactName = this.props.contact.name[0];
} else {
contactName = _getPreferredEmail(this.props.contact).value;
}
var contactName = _getContactDisplayName(this.props.contact);
document.title = contactName;
@@ -262,7 +262,10 @@ loop.conversationViews = (function(mozL10n) {
emailLinkButtonDisabled: true
});
this.props.dispatcher.dispatch(new sharedActions.FetchEmailLink());
this.props.dispatcher.dispatch(new sharedActions.FetchRoomEmailLink({
roomOwner: navigator.mozLoop.userProfile.email,
roomName: _getContactDisplayName(this.props.contact)
}));
},
render: function() {