Merge pull request #328 from jellyfin/release-10.3.z

Backmerge for Release 10.3.3

src/components/alert.js

@@ -1,6 +1,11 @@
 define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize) {
     'use strict';
 
+    function replaceAll(originalString, strReplace, strWith) {
+        var reg = new RegExp(strReplace, 'ig');
+        return originalString.replace(reg, strWith);
+    }
+
     return function (text, title) {
 
         var options;

src/components/appRouter.js

@@ -329,7 +329,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
         events.on(appHost, 'resume', onAppResume);
 
         connectionManager.connect({
-
             enableAutoLogin: appSettings.enableAutoLogin()
 
         }).then(function (result) {
@@ -343,7 +342,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
                 hashbang: options.hashbang !== false,
                 enableHistory: enableHistory()
             });
-        }).finally(function () {
+        }).catch().then(function() {
             loading.hide();
         });
     }

src/components/apphost.js

@@ -107,10 +107,10 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet
         deviceName = browser.tizen ? "Samsung Smart TV" : browser.web0s ? "LG Smart TV" : browser.operaTv ? "Opera TV" : browser.xboxOne ? "Xbox One" : browser.ps4 ? "Sony PS4" : browser.chrome ? "Chrome" : browser.edge ? "Edge" : browser.firefox ? "Firefox" : browser.msie ? "Internet Explorer" : browser.opera ? "Opera" : "Web Browser";
 
         if (browser.ipad) {
-            deviceName += " Ipad";
+            deviceName += " iPad";
         } else {
             if (browser.iphone) {
-                deviceName += " Iphone";
+                deviceName += " iPhone";
             } else {
                 if (browser.android) {
                     deviceName += " Android";

src/components/fullscreenManager.js

@@ -79,10 +79,10 @@ define(['events', 'dom', 'apphost', 'browser'], function (events, dom, appHost,
         passive: true
     });
 
+    function isTargetValid(target) {
+        return !dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA']);
+    }
     if (appHost.supports("fullscreenchange") && (browser.edgeUwp || -1 !== navigator.userAgent.toLowerCase().indexOf("electron"))) {
-        function isTargetValid(target) {
-            return !dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA']);
-        }
 
         dom.addEventListener(window, 'dblclick', function (e) {
 

src/components/playback/mediasession.js

@@ -273,11 +273,11 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
         events.on(currentPlayer, 'timeupdate', onGeneralEvent);
     }
 
+    function execute(name) {
+        playbackManager[name](currentPlayer);
+    }
     if (navigator.mediaSession) {
 
-        function execute(name) {
-            playbackManager[name](currentPlayer);
-        }
 
         navigator.mediaSession.setActionHandler('previoustrack', function () {
             execute('previousTrack');
@@ -310,4 +310,4 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
     });
 
     bindToPlayer(playbackManager.getCurrentPlayer());
-});
+});

src/components/playback/playbackmanager.js

@@ -2576,7 +2576,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                     } else {
 
-                        playerStartPositionTicks = null;
                         contentType = getMimeType(type.toLowerCase(), mediaSource.TranscodingContainer);
 
                         if (mediaUrl.toLowerCase().indexOf('copytimestamps=true') === -1) {

src/components/polyfills/objectassign.js

@@ -0,0 +1,23 @@
+if (typeof Object.assign != 'function') {
+    (function () {
+        Object.assign = function (target) {
+            'use strict';
+            if (target === undefined || target === null) {
+                throw new TypeError('Cannot convert undefined or null to object');
+            }
+
+            var output = Object(target);
+            for (var index = 1; index < arguments.length; index++) {
+                var source = arguments[index];
+                if (source !== undefined && source !== null) {
+                    for (var nextKey in source) {
+                        if (source.hasOwnProperty(nextKey)) {
+                            output[nextKey] = source[nextKey];
+                        }
+                    }
+                }
+            }
+            return output;
+        };
+    })();
+}