[openmeetings] branch master updated: [OPENMEETINGS-2444] screen-sharing in opera and yandex seems to work

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 04dd63b  [OPENMEETINGS-2444] screen-sharing in opera and yandex seems 
to work
04dd63b is described below

commit 04dd63b12e02113be775e5dbf2271a05bf7cee6e
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Sep 18 18:31:18 2020 +0700

    [OPENMEETINGS-2444] screen-sharing in opera and yandex seems to work
---
 .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html   | 2 +-
 .../main/java/org/apache/openmeetings/web/room/raw-video-util.js    | 6 ++++--
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 787b877..ef61649 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -107,7 +107,7 @@
                        </div>
                </div>
                <div id="sharer" wicket:message="title:730">
-                       <h2 class="alert">Screen-sharing is not supported in 
your browser</h2>
+                       <h2 class="alert text-warning">Screen-sharing is not 
supported in your browser</h2>
                        <div class="container p-0 m-0">
                                <div class="row-no-gutters">
                                        <label class="col-7"><wicket:message 
key="734"/></label>
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
index 92ff8f9..cb6bb9e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
@@ -274,8 +274,10 @@ var VideoUtil = (function() {
                const b = kurentoUtils.WebRtcPeer.browser;
                return (b.name === 'Edge' && b.major > 16)
                        || (b.name === 'Firefox')
-                       || (b.name === 'Chrome')
-                       || (b.name === 'Chromium');
+                       || (b.name === 'Opera')
+                       || (b.name === 'Yandex')
+                       || _isChrome(b)
+                       || _isEdgeChromium(b);
        }
        function _highlight(el, clazz, count) {
                if (!el || el.length < 1 || el.hasClass('disabled') || count < 
0) {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index d6b0112..91d57c7 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -38,7 +38,7 @@ var Video = (function() {
                        cnts = Sharer.baseConstraints(sd);
                        cnts.video.mediaSource = sd.shareType;
                        promise = navigator.mediaDevices.getUserMedia(cnts);
-               } else if (VideoUtil.isChrome(b) || 
VideoUtil.isEdgeChromium(b)) {
+               } else if (VideoUtil.sharingSupported()) {
                        cnts = {
                                video: true
                        };