[openmeetings] branch master updated: [OPENMEETINGS-2349] new chromium-edge detection method and fixes (#85)

[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 5b48b7c  [OPENMEETINGS-2349] new chromium-edge detection method and 
fixes (#85)
5b48b7c is described below

commit 5b48b7c3d1c247da408a2db465a7080c20e6884b
Author: Konstantin Kuzov <master.nosfer...@gmail.com>
AuthorDate: Thu May 14 09:36:30 2020 +0300

    [OPENMEETINGS-2349] new chromium-edge detection method and fixes (#85)
    
    - versioning for edge browsers is inconsistent across platforms and is 
unreliable for differentiation between EdgeHTML and Blink engines
     - introduce new VideoUtil.isEdgeChromium and check in both isEdge and 
isEdgeChromium if EdgeHTML's exclusive MSGestureEvent is available
     - this will also fix wrong audio destination issue
---
 .../src/main/java/org/apache/openmeetings/web/room/raw-sharer.js  | 2 +-
 .../main/java/org/apache/openmeetings/web/room/raw-video-util.js  | 7 ++++++-
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js   | 8 ++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
index de832c6..ce89b6d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
@@ -87,7 +87,7 @@ var Sharer = (function() {
        }
        function _typeDisabled(_b) {
                const b = _b || kurentoUtils.WebRtcPeer.browser;
-               return VideoUtil.isEdge(b) || VideoUtil.isChrome(b);
+               return VideoUtil.isEdge(b) || VideoUtil.isChrome(b) || 
VideoUtil.isEdgeChromium(b);
        }
        function _setBtnState(btn, state) {
                const dis = SHARE_STOPPED !== state
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 7202f81..91a7549 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
@@ -211,7 +211,11 @@ var VideoUtil = (function() {
        }
        function _isEdge(_b) {
                const b = _b || kurentoUtils.WebRtcPeer.browser;
-               return b.name === 'Edge';
+               return b.name === 'Edge' && "MSGestureEvent" in window;
+       }
+       function _isEdgeChromium(_b) {
+               const b = _b || kurentoUtils.WebRtcPeer.browser;
+               return b.name === 'Edge' && !("MSGestureEvent" in window);
        }
        function _setPos(v, pos) {
                if (v.dialog('instance')) {
@@ -288,6 +292,7 @@ var VideoUtil = (function() {
                return opts;
        };
        self.isEdge = _isEdge;
+       self.isEdgeChromium = _isEdgeChromium;
        self.isChrome = _isChrome;
        self.setPos = _setPos;
        self.askPermission = _askPermission;
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 f28e487..52d1f2f 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
@@ -32,17 +32,13 @@ var Video = (function() {
                        cnts = {
                                video: true
                        };
-                       if (b.major > 80) {
-                               promise = 
navigator.mediaDevices.getDisplayMedia(cnts);
-                       } else {
-                               promise = navigator.getDisplayMedia(cnts);
-                       }
+                       promise = navigator.getDisplayMedia(cnts);
                } else if (b.name === 'Firefox') {
                        // 
https://mozilla.github.io/webrtc-landing/gum_test.html
                        cnts = Sharer.baseConstraints(sd);
                        cnts.video.mediaSource = sd.shareType;
                        promise = navigator.mediaDevices.getUserMedia(cnts);
-               } else if (VideoUtil.isChrome(b)) {
+               } else if (VideoUtil.isChrome(b) || 
VideoUtil.isEdgeChromium(b)) {
                        cnts = {
                                video: true
                        };