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

2834 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 62ec5d202c
Merge pull request #1326 from nextcloud/extract-view-for-media-controls
Extract view for media controls
2018-12-06 12:57:57 +01:00
Daniel Calviño Sánchez d6a0528bbc Move MediaControlsView to precompiled Handlebars templates
In Nextcloud 15 the default Content Security Policy disallows unsafe
eval expressions, so Handlebars templates can no longer be compiled at
runtime.

For the time being that default Content Security Policy was lifted for
Talk so "Handlebars.compile" could still be used. However, this only
applies to Talk itself; when using Talk components in other apps they
must abide to the Content Security Policy of those apps. As
MediaControlsView is going to be used in the Files app it has been moved
to precompiled Handlebars templates (which are still compatible with the
regular Talk UI).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 12:08:46 +01:00
Daniel Calviño Sánchez c4c047a3c1 Extract view for media controls
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 12:08:46 +01:00
Nextcloud bot d11c5d5d00
[tx-robot] updated from transifex 2018-12-06 01:43:19 +00:00
Daniel Calviño Sánchez 6ed774e1f3 Unify the initial audio and video settings with and without local media
When "startWithoutLocalMedia" is called there is never audio nor video
(otherwise "startLocalMedia" would have been called instead), so there
is no need to call "isAudioEnabled" nor "isVideoEnabled". Moreover,
"initAudioVideoSettings" performs the same setup as the custom handling
in "startWithoutLocalMedia", so that custom handling can be replaced by
a call to "initAudioVideoSettings".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Daniel Calviño Sánchez a4e0a6e2e8 Remove inline styles for screen sharing menu items
The items in "app-navigation-entry-menu" lists were forced to be
displayed as blocks with an "!important" rule, so inline rules were used
to hide some items in the screensharing menu.

However, forcing the items in "app-navigation-entry-menus" lists to be
displayed as blocks is no longer needed; that class is only used in the
room list menus and in the screensharing menu, and both work fine
without it. Moreover, the server provides rules to hide items in those
menus by adding the "hidden" class, so that approach is used now instead
of the inline styles.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Daniel Calviño Sánchez 98277660a8 Do not enable the video UI before enabling the video
When the video is set as available there is no need to show the video
UI; it will be shown as needed when calling "enableVideo".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Daniel Calviño Sánchez d79ee15710 Unify handling of "localstream" with "localMediaStarted"
SimpleWebRTC emits the "localstream" event after a successful call to
"start/startLocalMedia". In turn, this is only called from
"startLocalVideo", which emits "localMediaStarted" if "startLocalMedia"
succeeded; "localMediaStarted" is handled by calling "startLocalMedia"
in the app, so now the setup done when handling "localstream" is merged
with the setup done when handling "localMediaStarted".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Daniel Calviño Sánchez 8ec4b20796 Do not change the stored configuration if audio is not available
In a similar way to the video button, now the audio button does not
handle the click event if audio is not available, instead of treating it
as disabled and trying to enable it.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Daniel Calviño Sánchez 9803cd012e Replace "videoWasEnabledAtLeastOnce" with "videoNotFound"
"videoWasEnabledAtLeastOnce" was used to allow or prevent the handling
of clicks on the video button. However, it was enabled in the handler
for the "localstreams" event, so it was being enabled even if there was
no video (although it was disabled as needed later during the handling
of the "localMediaStarted" event). In any case, its purpose can be
covered by "videoNotFound", so it was removed in favour of the last.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:56:01 +01:00
Joas Schilling 56f56f3864
Merge pull request #1330 from nextcloud/end-pending-signaling-when-user-is-no-longer-in-the-room
End pending signaling when user is no longer in the room
2018-12-05 19:53:33 +01:00
Joas Schilling 323c8aca4c
Merge pull request #1337 from nextcloud/bugfix/noid/fix-acceptance-tests-from-1275
Fix acceptance tests regression from #1275
2018-12-05 19:45:32 +01:00
Joas Schilling 7bf7074978
Merge pull request #1340 from nextcloud/extract-css-styles-for-videos
Extract CSS styles for videos
2018-12-05 19:45:02 +01:00
Daniel Calviño Sánchez ac0ceed2d6 Extract CSS styles for videos
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 19:12:03 +01:00
Joas Schilling 30e028eb1a
Fix acceptance tests regression from #1275
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-05 12:43:03 +01:00
Joas Schilling c331c00f90
Merge pull request #1325 from nextcloud/extract-view-for-empty-content
Extract view for empty content
2018-12-05 12:31:55 +01:00
Daniel Calviño Sánchez 807755d222 Update empty content message when the room state changes
The empty content message shown when waiting for others to join the call
depends on the state of the room. Thus, now the message is updated if
there are changes in that state, like the participants or the type of
the room.

The updates need to be disabled when WebRTC is not supported and when
waiting for the media permissions to prevent those messages from being
overriden; the updates are enabled again once the media permissions were
granted, or if they were rejected but it is possible to join the call
nevertheless (that is, if WebRTC is supported).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 11:00:05 +01:00
Daniel Calviño Sánchez 76a30595cc Extract view for the main empty content message
The main empty content message is kept in the templates generated by the
server to be able to show something to the user while the rest of the UI
is loading.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:59:57 +01:00
Daniel Calviño Sánchez 3a9a407fc2 Set room left/deleted message as a response to events
The "Connection" object should not change the UI directly, so now the
empty content message when the current room is left or deleted it is set
as a response to the "leaveCurrentRoom" and "destroy" events.

As the "deleter" parameter of "leaveCurrentRoom" was only used to show
one message or the other it is no longer needed, so it was removed.

The empty content message set when the room is deleted was also updated
to match the initial empty content message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:59:32 +01:00
Daniel Calviño Sánchez 9e42d26fb0 Move some actions from RoomListView to Room
Rooms are now deleted by using the standard "destroy" method of Backbone
models instead of calling the endpoint directly from the view. In a
similar way, the current user now removes herself from the room also by
destroying the model, but with a special URL. This will make possible to
listen to and handle the "destroy" event of the model from other places.

Leaving the current room when it is destroyed or removed was also moved
to the model; for consistency, the model now provides a method to join
the room too (which, in the end, will also synchronize the model).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:59:27 +01:00
Daniel Calviño Sánchez 6ad206a38c Move changes to the session history from RoomListView to Connection
The session history is modified by Connection when leaving the current
room for any reason (either because the user explicitly left the room or
because she no longer has access to it), so there is no need to modify
the session history from RoomListView.

For consistency, the session history is now modified only from
Connection when joining a room too, instead of modifying it from both
the RoomListView and Connection.

In any case, modifying the session history should probably done from App
instead as a response to an event, but for the time being this is good
enough.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:09 +01:00
Daniel Calviño Sánchez 85f024e812 Set the message explicitly instead of restoring the previous one
Restoring the message once the permissions were granted or not could
lead to the wrong message being shown if a different message was set in
the meantime; this would typically not happen in the general UI, but it
was a problem that had to be worked around in the "Request password" UI
by not using the main "syncAndSetActiveRoom" method.

As the message to be restored is deterministic now it is explicitly set
instead; it will always be the "Waiting for others to join the call"
message, except when WebRTC is not supported which will not be modified.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:09 +01:00
Daniel Calviño Sánchez 7a4abe4c3b Set "WebRTC is not supported" message on every call
Before, the empty content message informing the user that WebRTC was not
supported was set only when WebRTC was initialized. Due to this the
message could be overwritten when changing to a different room, and when
starting/joining a call in that other room the "Waiting for others"
message was shown instead. Now the "WebRTC is not supported" messages is
set on every call to prevent that.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:09 +01:00
Daniel Calviño Sánchez 457ca3606b Merge methods to set empty content message when alone in the call
The additional message with the URL of the room is now shown also for
guests; the icon shown to guests is also fixed (now the link icon is
shown instead of the contacts icon, which is the one used for group
rooms).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:09 +01:00
Daniel Calviño Sánchez f016b5fc9a Extract variable
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:09 +01:00
Daniel Calviño Sánchez e32a910f50 Base message on number of users and additional message on type of room
Before, the message explicitly mentioned the other user and her avatar
was used as the icon only for one to one rooms. Now that will be done
for any type of room if there is only another registered user and no
guests in that room.

In a similar way, the additional message hinting how to invite other
users now is always shown in group and public rooms, no matter how many
users are currently in the room; this is the same as before for public
rooms, although it was changed for consistency for group rooms, as in
that case the message was shown only when there were no other
participants in the room.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez 8fcf7369a6 Call "setEmptyContent" from a single point in the method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez b912286eb4 Replace magic numbers by named constants
This also fixes the additional message in group rooms, as it was shown
only for the owner, but not for moderators due to a wrong
"participantType" value.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez 2ded239eeb Take into account other guests in the room message for guests
Now "Waiting for {participantName} to join the call" will be shown only
if there is no other guest besides the current one in the room;
otherwise it would be unexpected that the call started when another
guest but not the mentioned participant joined it.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez 77dbeb9dc3 Move updating the room message ouf of the room list view
The room message should be updated as a response to a change of the
active room, and not when the room list view is rendered.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez 9f49baea0e Move room type constants to app class
The legacy "_CALL" sufix was also dropped.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Daniel Calviño Sánchez d2dc0b6e9d Get participants from the active room to set the room message for guests
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 10:46:08 +01:00
Joas Schilling 2d430f39e1
Use the existing method to get the participant instead of adding a new query
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-05 10:16:22 +01:00
Joas Schilling b82286e9fa
Merge pull request #1332 from nextcloud/fix-chat-tab-not-shown-in-files-app-if-sharing-tab-was-not-opened
Fix Chat tab not shown in Files app if Sharing tab was not opened
2018-12-05 09:58:54 +01:00
Daniel Calviño Sánchez d8a3c927a7 Fix Chat tab not shown in Files app if Sharing tab was not opened
When the details view is opened for a file the "shareTypes" of the
FileInfo are initially strings; they are converted to integers only once
the "Sharing" tab has been opened. Thus, now the "shareTypes" are always
"casted" to integers before performing a strict comparison against the
"SHARE_TYPE_XXX" constants.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-05 06:37:58 +01:00
Nextcloud bot 4f38362153
[tx-robot] updated from transifex 2018-12-05 01:38:16 +00:00
Daniel Calviño Sánchez 8975f5e6b9 Add "refresh-participant-list" for participants in a room just deleted
Note, however, that the participant will never receive that message from
the signaling endpoint, but a 404 error due to the room no longer
existing. In any case, this ends the pending signaling request as soon
as the room is deleted instead of keep waiting until the timeout ends.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-04 20:09:11 +01:00
Daniel Calviño Sánchez 0149b9d31d Add "refresh-participant-list" for participants just removed
When a participant is removed or disconnected from a room the
"refresh-participant-list" signaling message is added to all the
participants in that room. However, the participant just removed or
disconnected is no longer in the room, so the message needs to be
explicitly added for that participant.

Note, however, that the participant will never receive that message from
the signaling endpoint, but a 404 error due to no longer being in the
room. In any case, this ends the pending signaling request as soon as
the participant is removed or disconnected instead of keep waiting until
the timeout ends.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-04 19:23:55 +01:00
Joas Schilling 26e5e25a26
Merge pull request #1324 from nextcloud/fix-removeTabHeader-on-internet-explorer
Fix "removeTabHeader" on Internet Explorer
2018-12-04 13:58:39 +01:00
Joas Schilling a6d5c6f629
Merge pull request #1327 from nextcloud/firefox-screensharing-options
Fix wording and icons for screensharing options
2018-12-04 13:55:09 +01:00
Joas Schilling 73fc7f4545
Merge pull request #1323 from nextcloud/add-support-for-talk-sidebar-in-files-app
Add support for Talk sidebar in Files app
2018-12-04 13:50:39 +01:00
Nextcloud bot 237cf8ded3
[tx-robot] updated from transifex 2018-12-04 01:47:11 +00:00
Daniel Calviño Sánchez 811bd209b3 Do not show the Talk sidebar in Files app for shared folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-03 15:51:00 +01:00
Joas Schilling 3e93df0591 Allow to autocomplete users which are not in the room but have access to the file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-03 15:51:00 +01:00
Joas Schilling 031d0957f1 Rename included class from "ShareManager" to "IShareManager"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-03 15:50:17 +01:00
Joas Schilling d8de63cc5f Don't send call notifications for file-rooms
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-03 15:48:50 +01:00
Daniel Calviño Sánchez 432e1b0aa4 Show Talk sidebar in Files app
This commit introduces a DetailTabView plugin to show a chat view in the
sidebar of the Files app. The tab makes possible to chat in a Talk room
associated to the current file; due to this, the tab is visible only on
files that can be associated to a room, that is, files shared with the
current user or by the current user to another user (as a user, group,
circle...).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-03 15:48:41 +01:00
Ivan Sein 6ed1428e05 Fix wording.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-12-03 15:43:44 +01:00
Ivan Sein bb38d02177 Create specific button to show your screen.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-12-03 12:16:48 +01:00
Ivan Sein f0b94d8b82 Change text and icon for screensharing options in Firefox.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-12-03 10:48:15 +01:00