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

3236 Коммитов

Автор SHA1 Сообщение Дата
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
Daniel Calviño Sánchez 28d250fb21
Remove screens based on ScreenView instead of container element
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 10:54:16 +01:00
Daniel Calviño Sánchez a04de6fb99
Extract initial state of view for a screen shared in a call
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-21 10:54:16 +01:00
Joas Schilling 681b6a384a
Merge pull request #1569 from nextcloud/fix-removal-of-stale-peers-when-a-screen-is-shared
Fix removal of stale peers when a screen is shared
2019-02-21 10:41:10 +01:00
Joas Schilling d7866a7cc5
Allow multiline text insertion in chrome
The div needs to be inline-block, so Chrome/Chromium correctly insert
div-ed multi-line-text with new lines.
Otherwise they are just chained together on posting.

See https://stackoverflow.com/a/24689420
See https://github.com/nextcloud/spreed/issues/1561

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-21 09:52:55 +01:00
Nextcloud bot 7e00acac13
[tx-robot] updated from transifex 2019-02-21 01:37:16 +00:00
Daniel Calviño Sánchez f1ab337f4c Reset delayed video peer creation only with video offers
This ensures that receiving a screen offer will not abort a delayed
reconnection of the video.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-20 21:00:19 +01:00
Daniel Calviño Sánchez aa58fe9eb1 Fix screen icon not shown for peer after reconnecting
When a stale peer reconnects its Peer object, and thus its video view,
is removed and created again. The video view always set the screen icon
as not available and it was later changed to available if a screen offer
was received, so if the peer sent the screen offer before the video
offer the screen icon was never set as available. Now whether the screen
is shared or not is taken into account when setting the initial state of
the video view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-20 21:00:19 +01:00
Daniel Calviño Sánchez cd3d9e6d40 Fix removal of stale peers when a screen is shared
When a screen is shared a new offer is sent, just like when a video (or
audio only) connection starts; any offer coming from the same peer has
the same id, even if the type of the offer is different and separate
Peer objects are created for each offer. Due to this now a peer is stale
only if both the id and type of the new offer matches an existing peer;
otherwise when the screen offer was received the video peer was seen as
stale and removed.

Note, however, that even if the id and type of the new offer matches an
existing peer its participant should not be marked as disconnected, as
that removes all its Peer objects. If that happens then the connection
becames unstable with the peers sending offers back and forth due to the
difference in how they are started (immediately or delayed for video
depending on the ids of both peer, immediately for screens but only for
the peer that shares), the removal of Peers when a new offer is
received, and the creation of new Peers (and, with them, new offers)
when the signaling returns the user list.

Moreover, if a stale peer is found it is going to be replaced by a fresh
peer, so there it is not really needed to perform the whole
disconnection process. Therefore, now the stale peer object is simply
ended instead (and in the case of video peers their video and speaker
are explicitly removed; this should probably be done automatically when
handling the peer end, like done for screen peers, but for the time
being an explicit call is used just like in other areas of the file).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-02-20 20:59:58 +01:00
Ivan Sein e3531beb60 Fix css for call mentions.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2019-02-20 19:12:24 +01:00
Ivan Sein e5d8d8fd2d Fix call mention template.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2019-02-20 19:08:35 +01:00
Joas Schilling 63c485e5b3
Merge pull request #1539 from nextcloud/bugfix/1537/ensure-all-properties-of-rooms-are-set
Ensure all properties of rooms are set
2019-02-20 14:49:11 +01:00
Joas Schilling 58f0bd6d2f
Use call ROS object
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-20 14:44:18 +01:00
Joas Schilling 64ac6950f7
Allow to mention everyone in the conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-20 14:44:18 +01:00
Ivan Sein ffb42eb16b
Merge pull request #1453 from nextcloud/feature/noid/commands
🤖 Commands
2019-02-20 14:30:34 +01:00
Joas Schilling 4eec2a73a8
Use the new and correct way to set the message type
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-20 13:51:19 +01:00
Joas Schilling a6e915e6b6
Should also add new files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-20 13:26:05 +01:00
Joas Schilling 2f60aab4ab
Introduce a Message model for parsing which also allows to hide messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-02-20 12:17:37 +01:00