mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/Calls/ConferenceManager): in progress

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-29 13:57:35 +02:00
parent b0a1cd5058
commit 9a1ff5832a
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linphone-desktop/ui/modules/Linphone/Calls/Calls.js
View file

@ -144,7 +144,9 @@ function handleCountChanged (count) {
// -----------------------------------------------------------------------------
function handleCallRunning (call) {
setIndexWithCall(call)
if (!call.isInConference) {
setIndexWithCall(call)
}
}
function handleRowsAboutToBeRemoved (_, first, last) {
@ -161,7 +163,7 @@ function handleRowsInserted (_, first, last) {
for (var index = last; index >= first; index--) {
var call = model.data(model.index(index, 0))
if (call.isOutgoing) {
if (call.isOutgoing && !call.isInConference) {
updateSelectedCall(call)
return
}
@ -169,6 +171,9 @@ function handleRowsInserted (_, first, last) {
// First received call.
if (first === 0 && model.rowCount() === 1) {
updateSelectedCall(model.data(model.index(0, 0)))
var call = model.data(model.index(0, 0))
if (!call.isInConference) {
updateSelectedCall(model.data(model.index(0, 0)))
}
}
}

2
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file

@ -49,7 +49,7 @@ function getContent () {
var status = call.status
if (status == null) {
return null
return calls.conferenceModel.count > 0 ? conference : null
}
var CallModel = Linphone.CallModel