Merge pull request #1146 from JustAMan/webos2-play

Fix some issues blocking WebOS 1.2 / 2.0

package.json

@@ -92,7 +92,7 @@
           "src/components/cardbuilder/cardBuilder.js",
           "src/scripts/dom.js",
           "src/components/filedownloader.js",
-          "src/components/filesystem.js",
+          "src/scripts/filesystem.js",
           "src/scripts/keyboardnavigation.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",

src/components/apphost.js

@@ -46,20 +46,9 @@ define(["appSettings", "browser", "events", "htmlMediaHelper", "webSettings", "g
                 if (window.NativeShell) {
                     profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder);
                 } else {
-                    profile = profileBuilder(getBaseProfileOptions(item));
+                    var builderOpts = getBaseProfileOptions(item);
-
+                    builderOpts.enableSsaRender = (item && !options.isRetry && "allcomplexformats" !== appSettings.get("subtitleburnin"));
-                    if (item && !options.isRetry && "allcomplexformats" !== appSettings.get("subtitleburnin")) {
+                    profile = profileBuilder(builderOpts);
-                        if (!browser.orsay && !browser.tizen) {
-                            profile.SubtitleProfiles.push({
-                                Format: "ass",
-                                Method: "External"
-                            });
-                            profile.SubtitleProfiles.push({
-                                Format: "ssa",
-                                Method: "External"
-                            });
-                        }
-                    }
                 }
 
                 resolve(profile);

src/components/maintabsmanager.js

@@ -166,6 +166,7 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
             }).join('') + '</div></div>';
 
             tabsContainerElem.innerHTML = tabsHtml;
+            window.CustomElements.upgradeSubtree(tabsContainerElem);
 
             document.body.classList.add('withSectionTabs');
             tabOwnerView = view;

src/components/notifications/notifications.js

@@ -5,7 +5,8 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
         document.removeEventListener('click', onOneDocumentClick);
         document.removeEventListener('keydown', onOneDocumentClick);
 
-        if (window.Notification) {
+        // don't request notification permissions if they're already granted or denied
+        if (window.Notification && window.Notification.permission === "default") {
             /* eslint-disable-next-line compat/compat */
             Notification.requestPermission();
         }

src/scripts/browser.js

@@ -22,7 +22,7 @@ define([], function () {
             return true;
         }
 
-        if (userAgent.indexOf('webos') !== -1) {
+        if (userAgent.indexOf('web0s') !== -1) {
             return true;
         }
 

src/scripts/browserdeviceprofile.js

@@ -887,6 +887,16 @@ define(['browser'], function (browser) {
                 Method: 'External'
             });
         }
+        if (options.enableSsaRender) {
+            profile.SubtitleProfiles.push({
+                Format: 'ass',
+                Method: 'External'
+            });
+            profile.SubtitleProfiles.push({
+                Format: 'ssa',
+                Method: 'External'
+            });
+        }
 
         profile.ResponseProfiles = [];
         profile.ResponseProfiles.push({

src/scripts/settings/webSettings.js

@@ -11,5 +11,8 @@ function getConfig() {
 export function enableMultiServer() {
     return getConfig().then(config => {
         return config.multiserver;
+    }).catch(error => {
+        console.log("cannot get web config:", error);
+        return false;
     });
 }

src/scripts/site.js

@@ -709,6 +709,7 @@ var AppInfo = {};
             onError: onRequireJsError
         });
 
+        require(["fetch"]);
         require(["polyfill"]);
         require(["fast-text-encoding"]);
         require(["intersection-observer"]);

webpack.dev.js

@@ -14,7 +14,7 @@ module.exports = merge(common, {
         rules: [
             {
                 test: /\.js$/,
-                exclude: /node_modules[\\/](?!query-string)/,
+                exclude: /node_modules[\\/](?!query-string|split-on-first|strict-uri-encode)/,
                 loader: "babel-loader"
             },
             {

webpack.prod.js

@@ -7,7 +7,7 @@ module.exports = merge(common, {
         rules: [
             {
                 test: /\.js$/,
-                exclude: /node_modules[\\/](?!query-string)/,
+                exclude: /node_modules[\\/](?!query-string|split-on-first|strict-uri-encode)/,
                 loader: "babel-loader"
             },
             {