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

188 Коммитов

Автор SHA1 Сообщение Дата
Ivan Sein 1060fb8c76
Merge pull request #398 from nextcloud/mcu-integration
MCU integration
2018-06-22 16:21:47 +02:00
Jan-Christoph Borchardt b8a68510d5
Name change is in Chat, not right sidebar
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-06-21 16:39:12 +02:00
Joachim Bauch 1ba0f66dcf
Handle case where room has no participants.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-06-19 14:18:03 +02:00
Joas Schilling 2f367a8c30
Merge pull request #863 from nextcloud/bugfix/862/reset-audio-video-panel
Reset audio and video control panel.
2018-05-09 14:33:10 +02:00
Joas Schilling d53f01777c
Merge pull request #872 from nextcloud/fix-ui-when-leaving-current-call
Fix UI when leaving current call
2018-05-09 10:09:40 +02:00
Ivan Sein d49060a9d0
Merge pull request #871 from nextcloud/fix-chat-view-when-leaving-current-room
Fix chat view when leaving current room
2018-05-09 09:54:17 +02:00
Daniel Calviño Sánchez 264b412a65 Fix UI when leaving current call
When the chat view is shown in the main view the call UI (videos and
screens) is hidden using a CSS trick. However, when there is no chat
view in the main view the elements for videos and screens were always
visible. Those elements are initially "empty", but once the user joins a
call they are filled with contents (like the icon to mute the own audio,
or the avatar of the speaking user). As the elements were always visible
the call UI was shown in the main view after a room was left (either
explicitly or implicitly, for example, if the moderator deleted the
room), as in those cases there is no chat view hidding them.

Besides that, the empty content element was hidden when joining a call
but never shown back again. Due to that when a room was left after
joining a call the empty content element was also missing.

Now the videos, screens and empty content are explicitly shown or hidden
as needed when the user joins a call, leaves a call, or leaves a room,
just like it is done with the chat view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 05:00:27 +02:00
Joachim Bauch 172cbd64cb
Make sure user is in a room before the guest name is set.
Depending on timings it could happen that the guest name was set before
the room token was known (resulting in `null` in the url) or before the
user has joined the room (so setting the name got rejected).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 15:40:52 +02:00
Joachim Bauch b1ee96b5e4
Use dedicated event name to trigger when refreshing the participant list.
This avoids a conflict (introduced by #864) with the existing ´usersChanged`
event which is triggered when the `inCall` status of a user has changed.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 13:49:53 +02:00
Daniel Calviño Sánchez 86d2d66eb0 Fix chat view when leaving current room
When explicitly leaving the current room through the room list view the
chat view was detached. However, as the internal state of the
Application object (which manages the placement of the chat view) was
not updated the chat view was always hidden from that point on until the
page was reloaded.

Moreover, as the chat view was detached only when explicitly leaving the
current room the chat view was not hidden for other users in the room if
it was deleted by a moderator.

As the "leaveCurrentRoom" event is triggered in the room channel when
the current room is left, either explicitly or implicitly, now the
Application object listens to that event and hides the chat view as
needed when it is received.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-08 13:23:23 +02:00
Daniel Calviño Sánchez 8902a703b9 Rename event to a more accurate name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-08 13:23:23 +02:00
Joas Schilling 2b4e48c4bc
Merge pull request #864 from nextcloud/standalone-signaling-fixes
Various standalone signaling fixes.
2018-05-08 12:59:33 +02:00
Joachim Bauch 3f31e02786
Load participant list if users left/joined through standalone signaling.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 11:41:21 +02:00
Ivan Sein e4be2469c8 Reset audio and video control panel.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-07 17:45:47 +02:00
Joas Schilling 92cb0ee7a8
Should specify a parameter if you use it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 09:52:45 +02:00
Joas Schilling 6072261cac
Join the call only aftrer media access was done
When we delayed the media access, we were all fast with testing.
Before this patch, when there was already at least one user in the
call and you took longer to accept the media request than webrtc
took to init everything, you would always send a black video signal
and no sound, because the data was not there, when connections were
established with the other users. Now we first request the media and
send the join call to the server afterwards.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 11:01:46 +02:00
Daniel Calviño Sánchez 6453be1bb5 Fix scroll position when detaching chat view
When an element is detached and then attached again its scroll position
is reset to the top. Now the chat view provides the "saveScrollPosition"
and "restoreScrollPosition" methods to save the scroll position before
detaching its element and then restoring it when attached again.

Note that the position can not be exactly restored, as the size of the
chat view may have changed due to switching it from the main view to the
sidebar, and thus the visible messages can not be the same in both
cases. Due to this, restoring the scroll position just ensures that the
last message that was partially visible when it was saved will be fully
visible when it is restored.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-02 16:15:54 +02:00
Daniel Calviño Sánchez 50afe74a96 Remove support for newest on top chat layout
When the oldest on top layout was added it was enabled by default,
although the original newest on top layout was also kept as an option.
However, the newest on top layout has not been used since then, and it
is not expected to be used ever again. To make the chat view more
maintainable and ease adding new features this commit removes the
original newest on top chat layout.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-02 14:42:35 +02:00
Joas Schilling 5f717327dd
Remove useless logs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-23 16:05:22 +02:00
Ivan Sein 0d9a656e9f Keep video-disabled class for dark styled icon.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-16 14:08:36 +02:00
Joas Schilling a6a97da84b
Allow to join without camera/mic
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-29 12:54:52 +02:00
Joas Schilling 0c7378d19f
Merge pull request #757 from nextcloud/bugfix/noid/dark-style-screensharing-button
Fix screensharing button style when no local video.
2018-03-29 11:55:28 +02:00
Ivan Sein 7cd7abd947 Set dark style icon to screensharing button when local video is disabled.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-03-29 10:25:31 +02:00
Joas Schilling 625038d977
Do not error when disabling video while not in call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-29 10:12:05 +02:00
Joas Schilling 421cf740fa
Ignore shortcuts when chatting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-29 10:11:07 +02:00
Ivan Sein b111ce28c3
Merge pull request #751 from nextcloud/bugfix/noid/naming
Unify naming in the UI: rooms are conversations
2018-03-29 09:43:07 +02:00
Joas Schilling edc2869a91
Unify naming in the UI: rooms are conversations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-28 15:54:04 +02:00
Joas Schilling 3a65ce98a2
Add a shortcut for fullscreen
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-28 15:01:12 +02:00
Joas Schilling 9654ca510f
Add shortcut hint to video toggle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-28 15:01:12 +02:00
Joas Schilling 0ae0424ffe
Move audio mute to (m)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-28 15:01:11 +02:00
Joas Schilling 583e60b4d7
Allow screensharing even when alone
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-28 14:11:04 +02:00
Joas Schilling 04e2b8f303
Fix js handling of joining a room
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-27 17:16:38 +02:00
Joas Schilling 94f312d2e1
Rename leaveRoom to removeRoom in JS as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-27 17:16:38 +02:00
Joas Schilling 2dcb454c70
Streamline empty content messages
* Show previous message again, after media permissions was requested
* Always show message for media permission, not only on first connection

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-22 14:00:28 +01:00
Joas Schilling 175611935c
Merge pull request #724 from nextcloud/bugfix/721/update-participants-when-not-in-call
Update participant list also when not in call
2018-03-21 17:15:09 +01:00
Joas Schilling a618cf553c
Focus the chat input when rendering the view
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-21 15:54:42 +01:00
Joas Schilling 0be200e099
Update participant list also when not in call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-21 15:15:54 +01:00
Joas Schilling 8c957637d7
Simplify guest avatar handling
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-20 11:33:39 +01:00
Joas Schilling bdc71859bb
Don't use deprecated oc_current_user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-20 11:06:59 +01:00
Joas Schilling afcd192587
Send a request to the server when a guest renames
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-20 10:30:22 +01:00
Joas Schilling 813d9a97a0
Use editabletextlabel view for guest name in chat
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-19 13:36:35 +01:00
Joas Schilling fb64b35f0c
Merge pull request #709 from nextcloud/bugfix/noid/error-when-creating-rooms
Fix undefined this.connection when creating a room
2018-03-19 11:34:22 +01:00
Joas Schilling bcab6e09c0
Fix undefined this.connection when creating a room
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-19 11:23:10 +01:00
Joas Schilling 80a4e01de2
Add shortcuts for calling
a - toggle audio on/off
v - toggle video on/off
p - switch to participants tab
c - switch to chat tab

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-16 14:41:29 +01:00
Joas Schilling e805bfd025
Fix empty content message and correctly hide the video input until it is loaded
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-16 11:22:14 +01:00
Joas Schilling ad0b14c9e5
Remove empty wrapper method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-15 16:03:54 +01:00
Joas Schilling d5bd2da71f
Only setup webrtc and media when joining a call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-15 14:25:49 +01:00
Joas Schilling 90da1a0dae
Handle leaving call/room connection > signaling > webrtc
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-15 13:33:00 +01:00
Joas Schilling fe04d506fa
Rename calls to connection and remove static-ness
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-15 13:21:18 +01:00
Joas Schilling d5c1e31f42
Inject the application instead of the signaling and calling the app globally
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-15 13:19:36 +01:00