Merge pull request jellyfin#1660 from nyanmisaka/edge-chromium

Fix mkv directplay on Edge chromium
iwalton3 · Jul 27, 2020 · 0408ff0 · 0408ff0
2 parents 58198df + 7e5be8e
commit 0408ff0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/src/assets/img/devices/edgechromium.svg b/src/assets/img/devices/edgechromium.svg
diff --git a/src/components/apphost.js b/src/components/apphost.js
@@ -105,6 +105,8 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             deviceName = 'Sony PS4';
         } else if (browser.chrome) {
             deviceName = 'Chrome';
+        } else if (browser.edgeChromium) {
+            deviceName = 'Edge Chromium';
         } else if (browser.edge) {
             deviceName = 'Edge';
         } else if (browser.firefox) {
@@ -291,7 +293,7 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             features.push('fileinput');
         }
 
-        if (browser.chrome) {
+        if (browser.chrome || browser.edgeChromium) {
             features.push('chromecast');
         }
 

diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js
@@ -121,7 +121,7 @@ export function show(button) {
 
             // Unfortunately we can't allow the url to change or chromecast will throw a security error
             // Might be able to solve this in the future by moving the dialogs to hashbangs
-            if (!(!browser.chrome || appHost.supports('castmenuhashchange'))) {
+            if (!(!browser.chrome && !browser.edgeChromium || appHost.supports('castmenuhashchange'))) {
                 menuOptions.enableHistory = false;
             }
 

diff --git a/src/scripts/browser.js b/src/scripts/browser.js
@@ -127,7 +127,10 @@ define([], function () {
     var uaMatch = function (ua) {
         ua = ua.toLowerCase();
 
-        var match = /(edge)[ \/]([\w.]+)/.exec(ua) ||
+        var match = /(edg)[ \/]([\w.]+)/.exec(ua) ||
+            /(edga)[ \/]([\w.]+)/.exec(ua) ||
+            /(edgios)[ \/]([\w.]+)/.exec(ua) ||
+            /(edge)[ \/]([\w.]+)/.exec(ua) ||
             /(opera)[ \/]([\w.]+)/.exec(ua) ||
             /(opr)[ \/]([\w.]+)/.exec(ua) ||
             /(chrome)[ \/]([\w.]+)/.exec(ua) ||
@@ -190,7 +193,9 @@ define([], function () {
         browser[matched.platform] = true;
     }
 
-    if (!browser.chrome && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
+    browser.edgeChromium = browser.edg || browser.edga || browser.edgios;
+
+    if (!browser.chrome && !browser.edgeChromium && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
         browser.safari = true;
     }
 

diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
@@ -144,6 +144,10 @@ define(['browser'], function (browser) {
             return true;
         }
 
+        if (browser.edgeChromium && browser.windows) {
+            return true;
+        }
+
         if (browser.edgeUwp) {
             return true;
         }
@@ -210,7 +214,7 @@ define(['browser'], function (browser) {
                 supported = browser.tizen;
                 break;
             case 'mov':
-                supported = browser.tizen || browser.web0s || browser.chrome || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.chrome || browser.edgeChromium || browser.edgeUwp;
                 videoCodecs.push('h264');
                 break;
             case 'm2ts':

diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js
@@ -31,6 +31,11 @@
                     case 'Safari iPad':
                     case 'Safari iPhone':
                         return baseUrl + 'safari.svg';
+                    case 'Edge Chromium':
+                    case 'Edge Chromium Android':
+                    case 'Edge Chromium iPad':
+                    case 'Edge Chromium iPhone':
+                        return baseUrl + 'edgechromium.svg';
                     case 'Edge':
                         return baseUrl + 'edge.svg';
                     case 'Internet Explorer':

diff --git a/src/scripts/site.js b/src/scripts/site.js
@@ -492,7 +492,7 @@ function initClient() {
         if (appHost.supports('remotecontrol')) {
             list.push('plugins/sessionPlayer/plugin');
 
-            if (browser.chrome || browser.opera) {
+            if (browser.chrome || browser.edgeChromium || browser.opera) {
                 list.push('plugins/chromecastPlayer/plugin');
             }
         }