Commit 9a1ff583 authored by Ronan Abhamon's avatar Ronan Abhamon

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

parent b0a1cd50
...@@ -144,7 +144,9 @@ function handleCountChanged (count) { ...@@ -144,7 +144,9 @@ function handleCountChanged (count) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function handleCallRunning (call) { function handleCallRunning (call) {
setIndexWithCall(call) if (!call.isInConference) {
setIndexWithCall(call)
}
} }
function handleRowsAboutToBeRemoved (_, first, last) { function handleRowsAboutToBeRemoved (_, first, last) {
...@@ -161,7 +163,7 @@ function handleRowsInserted (_, first, last) { ...@@ -161,7 +163,7 @@ function handleRowsInserted (_, first, last) {
for (var index = last; index >= first; index--) { for (var index = last; index >= first; index--) {
var call = model.data(model.index(index, 0)) var call = model.data(model.index(index, 0))
if (call.isOutgoing) { if (call.isOutgoing && !call.isInConference) {
updateSelectedCall(call) updateSelectedCall(call)
return return
} }
...@@ -169,6 +171,9 @@ function handleRowsInserted (_, first, last) { ...@@ -169,6 +171,9 @@ function handleRowsInserted (_, first, last) {
// First received call. // First received call.
if (first === 0 && model.rowCount() === 1) { 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)))
}
} }
} }
...@@ -49,7 +49,7 @@ function getContent () { ...@@ -49,7 +49,7 @@ function getContent () {
var status = call.status var status = call.status
if (status == null) { if (status == null) {
return null return calls.conferenceModel.count > 0 ? conference : null
} }
var CallModel = Linphone.CallModel var CallModel = Linphone.CallModel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment