Fix more sonarqube bugs

src/components/apphost.js

@@ -5,7 +5,7 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         var disableHlsVideoAudioCodecs = [];
 
         if (item && htmlMediaHelper.enableHlsJsPlayer(item.RunTimeTicks, item.MediaType)) {
-            if (browser.edge || browser.msie) {
+            if (browser.edge) {
                 disableHlsVideoAudioCodecs.push('mp3');
             }
 
@@ -93,18 +93,36 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
 
     function getDeviceName() {
         var deviceName;
-        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' : browser.safari ? 'Safari' : 'Web Browser';
+        if (browser.tizen) {
+            deviceName = 'Samsung Smart TV';
+        } else if (browser.web0s) {
+            deviceName = 'LG Smart TV';
+        } else if (browser.operaTv) {
+            deviceName = 'Opera TV';
+        } else if (browser.xboxOne) {
+            deviceName = 'Xbox One';
+        } else if (browser.ps4) {
+            deviceName = 'Sony PS4';
+        } else if (browser.chrome) {
+            deviceName = 'Chrome';
+        } else if (browser.edge) {
+            deviceName = 'Edge';
+        } else if (browser.firefox) {
+            deviceName = 'Firefox';
+        } else if (browser.opera) {
+            deviceName = 'Opera';
+        } else if (browser.safari) {
+            deviceName = 'Safari';
+        } else {
+            deviceName = 'Web Browser';
+        }
 
         if (browser.ipad) {
             deviceName += ' iPad';
-        } else {
+        } else if (browser.iphone) {
-            if (browser.iphone) {
+            deviceName += ' iPhone';
-                deviceName += ' iPhone';
+        } else if (browser.android) {
-            } else {
+            deviceName += ' Android';
-                if (browser.android) {
-                    deviceName += ' Android';
-                }
-            }
         }
 
         return deviceName;
@@ -267,7 +285,7 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             if (enabled) features.push('multiserver');
         });
 
-        if (!browser.orsay && !browser.msie && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
+        if (!browser.orsay && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
             features.push('subtitleappearancesettings');
         }
 

src/components/htmlvideoplayer/plugin.js

@@ -279,14 +279,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         }
 
         self.play = function (options) {
-
-            if (browser.msie) {
-                if (options.playMethod === 'Transcode' && !window.MediaSource) {
-                    alert('Playback of this content is not supported in Internet Explorer. For a better experience, try a modern browser such as Microsoft Edge, Google Chrome, Firefox or Opera.');
-                    return Promise.reject();
-                }
-            }
-
             self._started = false;
             self._timeUpdated = false;
 
@@ -1411,13 +1403,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         var video = document.createElement('video');
         if (video.webkitSupportsPresentationMode && typeof video.webkitSetPresentationMode === 'function' || document.pictureInPictureEnabled) {
             list.push('PictureInPicture');
-        } else if (browser.ipad) {
-            // Unfortunately this creates a false positive on devices where its' not actually supported
-            if (navigator.userAgent.toLowerCase().indexOf('os 9') === -1) {
-                if (video.webkitSupportsPresentationMode && video.webkitSupportsPresentationMode && typeof video.webkitSetPresentationMode === 'function') {
-                    list.push('PictureInPicture');
-                }
-            }
         } else if (window.Windows) {
             if (Windows.UI.ViewManagement.ApplicationView.getForCurrentView().isViewModeSupported(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay)) {
                 list.push('PictureInPicture');

src/components/libraryoptionseditor/libraryoptionseditor.js

@@ -120,7 +120,12 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
             html += plugin.Name;
             html += '</h3>';
             html += '</div>';
-            index > 0 ? html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>' : plugins.length > 1 && (html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>'), html += '</div>';
+            if (index > 0) {
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+            } else if (plugins.length > 1) {
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+            }
+            html += '</div>';
         });
 
         html += '</div>';

src/components/skinManager.js

@@ -57,7 +57,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
         var selectedTheme;
 
         for (var i = 0, length = themes.length; i < length; i++) {
-
             var theme = themes[i];
             if (theme[isDefaultProperty]) {
                 defaultTheme = theme;

src/controllers/dashboard/metadataimagespage.js

@@ -29,14 +29,18 @@ define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle']
         var promises = [ApiClient.getServerConfiguration(), populateLanguages(page.querySelector('#selectLanguage')), populateCountries(page.querySelector('#selectCountry'))];
         Promise.all(promises).then(function(responses) {
             var config = responses[0];
-            page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage || '', page.querySelector('#selectCountry').value = config.MetadataCountryCode || '', loading.hide();
+            page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage || '';
+            page.querySelector('#selectCountry').value = config.MetadataCountryCode || '';
+            loading.hide();
         });
     }
 
     function onSubmit() {
         var form = this;
         return loading.show(), ApiClient.getServerConfiguration().then(function(config) {
-            config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value, config.MetadataCountryCode = form.querySelector('#selectCountry').value, ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
+            config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value;
+            config.MetadataCountryCode = form.querySelector('#selectCountry').value;
+            ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
         }), !1;
     }
 
@@ -59,6 +63,8 @@ define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle']
     $(document).on('pageinit', '#metadataImagesConfigurationPage', function() {
         $('.metadataImagesConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
     }).on('pageshow', '#metadataImagesConfigurationPage', function() {
-        libraryMenu.setTabs('metadata', 2, getTabs), loading.show(), loadPage(this);
+        libraryMenu.setTabs('metadata', 2, getTabs);
+        loading.show();
+        loadPage(this);
     });
 });

src/controllers/dashboard/notifications/notification.js

@@ -73,9 +73,6 @@ define(['jQuery', 'emby-checkbox', 'fnchecked'], function ($) {
                 notificationOptions.Options.push(notificationConfig);
             }
 
-            types.filter(function (n) {
-                return n.Type == type;
-            })[0];
             notificationConfig.Enabled = $('#chkEnabled', page).checked();
             notificationConfig.SendToUserMode = $('#selectUsers', page).val();
             notificationConfig.DisabledMonitorUsers = $('.chkMonitor', page).get().filter(function (c) {

src/controllers/playback/videoosd.js

@@ -157,7 +157,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             });
 
             if (!displayName) {
-                displayItem.Type;
+                displayName = displayItem.Type;
             }
 
             titleElement.innerHTML = displayName;

src/dlnaprofiles.html

@@ -11,7 +11,7 @@
                         <a is="emby-linkbutton" href="dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
                             <span class="material-icons add"></span>
                         </a>
-                        <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
+                        <a is="emby-linkbutton" style="margin-left:2em!important;" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
 
                     <p>${CustomDlnaProfilesHelp}</p>

src/elements/emby-slider/emby-slider.js

@@ -148,7 +148,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
         this.classList.add('mdl-slider');
         this.classList.add('mdl-js-slider');
 
-        if (browser.edge || browser.msie) {
+        if (browser.edge) {
             this.classList.add('slider-browser-edge');
         }
         if (!layoutManager.mobile) {

src/scripts/browser.js

@@ -14,10 +14,6 @@ define([], function () {
             return true;
         }
 
-        if (userAgent.indexOf('nintendo') !== -1) {
-            return true;
-        }
-
         if (userAgent.indexOf('viera') !== -1) {
             return true;
         }
@@ -93,7 +89,7 @@ define([], function () {
     var _supportsCssAnimation;
     var _supportsCssAnimationWithPrefix;
     function supportsCssAnimation(allowPrefix) {
-
+        // TODO: Assess if this is still needed, as all of our targets should natively support CSS animations.
         if (allowPrefix) {
             if (_supportsCssAnimationWithPrefix === true || _supportsCssAnimationWithPrefix === false) {
                 return _supportsCssAnimationWithPrefix;
@@ -145,7 +141,6 @@ define([], function () {
             /(chrome)[ \/]([\w.]+)/.exec(ua) ||
             /(safari)[ \/]([\w.]+)/.exec(ua) ||
             /(firefox)[ \/]([\w.]+)/.exec(ua) ||
-            /(msie) ([\w.]+)/.exec(ua) ||
             ua.indexOf('compatible') < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
             [];
 
@@ -161,14 +156,6 @@ define([], function () {
 
         if (browser === 'edge') {
             platform_match = [''];
-        } else {
-            if (ua.indexOf('windows phone') !== -1 || ua.indexOf('iemobile') !== -1) {
-
-                // http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
-                browser = 'msie';
-            } else if (ua.indexOf('like gecko') !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
-                browser = 'msie';
-            }
         }
 
         if (browser === 'opr') {
@@ -211,7 +198,7 @@ define([], function () {
         browser[matched.platform] = true;
     }
 
-    if (!browser.chrome && !browser.msie && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
+    if (!browser.chrome && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
         browser.safari = true;
     }
 
@@ -224,7 +211,10 @@ define([], function () {
         browser.mobile = true;
     }
 
-    browser.xboxOne = userAgent.toLowerCase().indexOf('xbox') !== -1;
+    if (userAgent.toLowerCase().indexOf('xbox') !== -1) {
+        browser.xboxOne = true;
+        browser.tv = true;
+    }
     browser.animate = typeof document !== 'undefined' && document.documentElement.animate != null;
     browser.tizen = userAgent.toLowerCase().indexOf('tizen') !== -1 || self.tizen != null;
     browser.web0s = userAgent.toLowerCase().indexOf('Web0S'.toLowerCase()) !== -1;

src/scripts/browserdeviceprofile.js

@@ -188,20 +188,6 @@ define(['browser'], function (browser) {
         return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
     }
 
-    function getFlvMseDirectPlayProfile() {
-        var videoAudioCodecs = ['aac'];
-        if (!browser.edge && !browser.msie) {
-            videoAudioCodecs.push('mp3');
-        }
-
-        return {
-            Container: 'flv',
-            Type: 'Video',
-            VideoCodec: 'h264',
-            AudioCodec: videoAudioCodecs.join(',')
-        };
-    }
-
     function getDirectPlayProfileForVideoContainer(container, videoAudioCodecs, videoTestElement, options) {
         var supported = false;
         var profileContainer = container;
@@ -230,9 +216,6 @@ define(['browser'], function (browser) {
                 break;
             case 'flv':
                 supported = browser.tizen || browser.orsay;
-                //if (!supported && window.MediaSource != null && window.MediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"')) {
-                //    return getFlvMseDirectPlayProfile();
-                //}
                 break;
             case '3gp':
             case 'mts':

src/scripts/editorsidebar.js

@@ -209,7 +209,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     function onNodeOpen(event, data) {
         var page = $(this).parents('.page')[0];
         var node = data.node;
-        if (node.children && node.children) {
+        if (node.children) {
             loadNodesToLoad(page, node);
         }
         if (node.li_attr && node.id != '#' && !node.li_attr.loadedFromServer) {
@@ -221,7 +221,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     function onNodeLoad(event, data) {
         var page = $(this).parents('.page')[0];
         var node = data.node;
-        if (node.children && node.children) {
+        if (node.children) {
             loadNodesToLoad(page, node);
         }
         if (node.li_attr && node.id != '#' && !node.li_attr.loadedFromServer) {

src/scripts/librarymenu.js

@@ -567,27 +567,25 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
         if (libraryMenuOptions) {
             getUserViews(apiClient, userId).then(function (result) {
                 var items = result;
-                var html = '';
+                var html = `<h3 class="sidebarHeader">${globalize.translate('HeaderMedia')}</h3>`;
-                html += '<h3 class="sidebarHeader">';
-                html += globalize.translate('HeaderMedia');
-                html += '</h3>';
                 html += items.map(function (i) {
                     var icon = i.icon || imageHelper.getLibraryIcon(i.CollectionType);
                     var itemId = i.Id;
 
-                    if (i.onclick) {
+                    const linkHtml = `<a is="emby-linkbutton" data-itemid="${itemId}" class="lnkMediaFolder navMenuOption" href="${getItemHref(i, i.CollectionType)}">
-                        i.onclick;
+                                    <span class="material-icons navMenuOptionIcon ${icon}"></span>
-                    }
+                                    <span class="sectionName navMenuOptionText">${i.Name}</span>
+                                  </a>`;
 
-                    return '<a is="emby-linkbutton" data-itemid="' + itemId + '" class="lnkMediaFolder navMenuOption" href="' + getItemHref(i, i.CollectionType) + '"><span class="material-icons navMenuOptionIcon ' + icon + '"></span><span class="sectionName navMenuOptionText">' + i.Name + '</span></a>';
+                    return linkHtml;
                 }).join('');
                 libraryMenuOptions.innerHTML = html;
                 var elem = libraryMenuOptions;
                 var sidebarLinks = elem.querySelectorAll('.navMenuOption');
 
-                for (var i = 0, length = sidebarLinks.length; i < length; i++) {
+                for (const sidebarLink of sidebarLinks) {
-                    sidebarLinks[i].removeEventListener('click', onSidebarLinkClick);
+                    sidebarLink.removeEventListener('click', onSidebarLinkClick);
-                    sidebarLinks[i].addEventListener('click', onSidebarLinkClick);
+                    sidebarLink.addEventListener('click', onSidebarLinkClick);
                 }
             });
         }
@@ -900,6 +898,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
 
         updateMenuForPageType(isDashboardPage, isLibraryPage);
 
+        // TODO: Seems to do nothing? Check if needed (also in other views).
         if (!e.detail.isRestored) {
             window.scrollTo(0, 0);
         }

src/scripts/playlists.js

@@ -69,10 +69,11 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
             showLoadingMessage();
             var query = getQuery(view);
             var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
+            // TODO: promise2 is unused, check if necessary.
             var promise2 = Dashboard.getCurrentUser();
             Promise.all([promise1, promise2]).then(function (responses) {
                 var result = responses[0];
-                responses[1];
+                // TODO: Is the scroll necessary?
                 window.scrollTo(0, 0);
                 var html = '';
                 var viewStyle = getPageData(view).view;

src/scripts/site.js

@@ -368,8 +368,7 @@ var AppInfo = {};
         }
     }
 
-    function initRequireWithBrowser(browser) {
+    function initRequireWithBrowser() {
-        var bowerPath = getBowerPath();
         var componentsPath = getComponentsPath();
         var scriptsPath = getScriptsPath();
 
@@ -378,13 +377,7 @@ var AppInfo = {};
         define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
         define('shell', [componentsPath + '/shell'], returnFirstDependency);
 
-        if ('registerElement' in document) {
+        define('registerElement', ['document-register-element'], returnFirstDependency);
-            define('registerElement', []);
-        } else if (browser.msie) {
-            define('registerElement', ['webcomponents'], returnFirstDependency);
-        } else {
-            define('registerElement', ['document-register-element'], returnFirstDependency);
-        }
 
         define('alert', [componentsPath + '/alert'], returnFirstDependency);
 
@@ -609,8 +602,8 @@ var AppInfo = {};
         /* eslint-enable compat/compat */
     }
 
-    function onWebComponentsReady(browser) {
+    function onWebComponentsReady() {
-        initRequireWithBrowser(browser);
+        initRequireWithBrowser();
 
         if (self.appMode === 'cordova' || self.appMode === 'android' || self.appMode === 'standalone') {
             AppInfo.isNativeApp = true;
@@ -1127,7 +1120,7 @@ var AppInfo = {};
         });
     })();
 
-    return require(['browser'], onWebComponentsReady);
+    return onWebComponentsReady();
 }();
 
 pageClassOn('viewshow', 'standalonePage', function () {