Граф коммитов

3203 Коммитов

Автор SHA1 Сообщение Дата
Nextcloud bot 1a4f96436a
[tx-robot] updated from transifex 2019-02-27 01:38:01 +00:00
Joas Schilling a12ef77f47
Merge pull request #1580 from nextcloud/bugfix/noid/fix-unit-tests
Fix unit tests
2019-02-26 12:11:39 +01:00
Joas Schilling 5489820cd3
Merge pull request #1555 from nextcloud/extract-view-for-local-participant
Extract view for local participant
2019-02-26 09:28:42 +01:00
Joas Schilling b8b8a3a519
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-26 09:25:40 +01:00
Nextcloud bot 73106559a3
[tx-robot] updated from transifex 2019-02-26 01:37:06 +00:00
Daniel Calviño Sánchez 405fb8c153 Move handling of speaking status to LocalVideoView
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez dd5e2bb671 Move handling of enabling and disabling the video to LocalVideoView
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez 6b99d44212 Collapse if clauses
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez 7914c96484 Combine methods to enable and disable video
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez c9299b9b81 Use an implicit attribute to store whether the hint was displayed or not
As it is a boolean flag just set once and only needed when the current
user is a guest an implicit attribute added dynamically is now used
instead of an explicit attribute; "_" was prepended to the name too to
mark it as "private".

Note that in the embedded Talk UI there was no explicit attribute, so
the condition would have never passed and the hint would have never been
shown. However, as the embedded Talk UI is currently not used with
guests it was not an issue.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez a9a1125b26 Move handling of avatars to LocalVideoView
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:20 +01:00
Daniel Calviño Sánchez 69d01b3cc6 Use explicit CSS classes instead of implicit styles
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez a8e0b83242 Extract initial state of view for a local participant in a call
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 08b2c6beb8 Remove call with no effect
In the embedded Talk UI the local video container is not hidden, so
there is no need to remove its "hidden" CSS class when the local media
is started.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez bbad46ee16 Remove unused element
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 055ee3f18e Fix indentation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 3f3e7892c0 Combine methods to set video as available or not available
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 11131de9b7 Combine methods to set audio as available or not available
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 041c5d77d7 Do not set audio button as enabled when audio is set as available
When the audio is set as available it is followed by a call to
"setAudioEnabled(bool)", so the state of the audio button just set was
always immediately overriden. Moreover, as only the button state but not
the related attribute was set the view was left in an inconsistent
state.

It is currently not possible to directly call "setVideoEnabled(bool)"
from "hasVideo()", so for consistency both "hasAudio()" and "hasVideo()"
expect "setXXXEnabled(bool)" to be explicitly called after they are
called.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 85d9c1dc27 Do not set media as disabled when media is not available
The audio and video are explicitly set as disabled before they are set
as not available, so there is no need to set them as disabled again.
Moreover, even if they were not explicitly set as disabled it would not
be really necessary to disable the audio and video when they are not
available.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez e485e34022 Combine methods to enable and disable video
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 3a7b1a3c3a Remove unneeded condition
The condition passes when the video is available, but it will only be
executed anyway if the video is available due to the initial condition
in the method.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez f3a389bd62 Combine methods to enable and disable audio
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 9aa8ae01f9 Reorder "if" clause in "toggleVideo" to match the one in "toggleAudio"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 6631fcc3cb Rename and adjust "videoDisabled" to "videoEnabled"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 6ca504db7a Rename and adjust "audioDisabled" to "audioEnabled"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez b336038451 Rename and adjust "_videoNotFound" to "videoAvailable"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 17fd6a2a03 Rename and adjust "_audioNotFound" to "audioAvailable"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez c68064546b Prepend "_" to attributes not used from outside
The proper name was being used in the "constructor" to initialize the
attributes to false, but not in the rest of the file; this caused the
attributes to be undefined when they were first used, which
coincidentally in those cases it was the same as if they were false, so
the typo caused no issues.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez 383d000822 Replace double quotes with single quotes
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Daniel Calviño Sánchez b482a8af1a Inline "enableVideoUI" and "hideVideo"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-25 16:13:19 +01:00
Ivan Sein 6fb78781cd
Merge pull request #1573 from nextcloud/bugfix/noid/fix-missing-guest-names
Fix missing guest names in chat
2019-02-25 15:35:03 +01:00
Joas Schilling fa29ecae13
Merge pull request #1570 from nextcloud/bugfix/1561/multiline-insert-from-websites-in-chrome
Allow multiline text insertion in chrome
2019-02-25 15:22:18 +01:00
Joas Schilling 8a17c7f098
Merge pull request #1572 from nextcloud/bugfix/noid/fix-unit-tests-from-1453
Fix unit tests from #1453
2019-02-25 15:05:01 +01:00
Joas Schilling 2f4726de7b
Merge pull request #1574 from nextcloud/fix-disabling-video-when-joining-a-call-in-a-room-with-more-than-five-participants
Fix disabling video when joining a call in a room with more than five participants
2019-02-25 15:04:29 +01:00
Nextcloud bot f7e998249e
[tx-robot] updated from transifex 2019-02-25 01:37:28 +00:00
Nextcloud bot ceccd9f4a5
[tx-robot] updated from transifex 2019-02-24 01:40:44 +00:00
Nextcloud bot fd75184fe8
[tx-robot] updated from transifex 2019-02-23 01:38:03 +00:00
Nextcloud bot 841105e2c7
[tx-robot] updated from transifex 2019-02-22 01:38:29 +00:00
Daniel Calviño Sánchez 726eb60fd7 Make "disableVideo" consistent with "enableVideo"
When calling "disableVideo" the video was hidden even if it was not
possible to disable the video; this was done to hide the video even if
WebRTC was not started yet when "disableVideo" was called. Now that the
video is disabled when joining the call in a room with more than five
participants instead of just when entering a room with more than five
participants that special behaviour is no longer needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 18:30:58 +01:00
Daniel Calviño Sánchez b929a2ae96 Fix disabling video when joining a call in a room with > 5 participants
Until now, when entering a room with more than five participants the
video was disabled. However, if the local video is available it is
enabled when WebRTC starts. Due to this, if WebRTC was also started when
joining the call (that is, no previous calls were made in other rooms
since the last page reload) the video was enabled instead of disabled.
Besides that, if leaving the call with the video enabled and joining it
again the video was still enabled, as the room had not been entered
again to disable the video. To fix both issues now the video is disabled
when joining the call instead of when entering the room.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 18:30:58 +01:00
Joas Schilling 55511341cb
Fix missing guest names in chat
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-21 15:19:55 +01:00
Joas Schilling 547ec3fafc
Merge pull request #1531 from nextcloud/feature/1412/all-mention
Allow to mention everyone in the conversation
2019-02-21 14:53:53 +01:00
Joas Schilling 6edc52c58c
Fix unit tests from #1453
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-21 14:30:20 +01:00
Daniel Calviño Sánchez 614bad4481 Adjust vertical position of icons due to "inline-block" message in form
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 11:03:48 +01:00
Joas Schilling 6ecbd00d49
Merge pull request #1553 from nextcloud/extract-view-for-a-shared-screen
Extract view for a shared screen
2019-02-21 10:56:18 +01:00
Joas Schilling a7555b30a2
Fix eslint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-21 10:55:01 +01:00
Daniel Calviño Sánchez 07d1e66f19
Replace legacy "getContainerId" with direct access to ScreenViews array
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 10:54:16 +01:00
Daniel Calviño Sánchez 4857d3243e
User "ScreenView.setParticipantName" to set the name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 10:54:16 +01:00
Daniel Calviño Sánchez 59a200585a
Move removal of screen element to "SharedScreens.remove()" function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 10:54:16 +01:00