Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
9a1ff583
Commit
9a1ff583
authored
May 29, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
b0a1cd50
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
Calls.js
linphone-desktop/ui/modules/Linphone/Calls/Calls.js
+8
-3
CallsWindow.js
linphone-desktop/ui/views/App/Calls/CallsWindow.js
+1
-1
No files found.
linphone-desktop/ui/modules/Linphone/Calls/Calls.js
View file @
9a1ff583
...
...
@@ -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
)))
}
}
}
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file @
9a1ff583
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment