From a09a9e9a3a5f70cf2cfe915cd4725034aa56a06a Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 23 Jul 2020 21:12:57 +0200 Subject: [PATCH] Remove some more things --- src/components/dialog/dialog.js | 4 -- src/components/maintabsmanager.js | 31 ++------------- src/components/multiSelect/multiSelect.js | 3 -- src/components/slideshow/slideshow.js | 3 -- src/elements/emby-slider/emby-slider.js | 21 ++-------- src/plugins/htmlVideoPlayer/plugin.js | 48 +---------------------- src/scripts/browser.js | 2 - 7 files changed, 8 insertions(+), 104 deletions(-) diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js index 5dd6017d8f..2250dac7da 100644 --- a/src/components/dialog/dialog.js +++ b/src/components/dialog/dialog.js @@ -45,10 +45,6 @@ import 'flexStyles'; dlg.classList.add('dialog-fullscreen-lowres'); } - dlg.querySelector('.btnCancel').addEventListener('click', function (e) { - dialogHelper.close(dlg); - }); - if (options.title) { dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title || ''; } else { diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js index 79dd883fcd..8251f3ce72 100644 --- a/src/components/maintabsmanager.js +++ b/src/components/maintabsmanager.js @@ -8,25 +8,10 @@ import 'emby-button'; let tabOwnerView; const queryScope = document.querySelector('.skinHeader'); - let footerTabsContainer; let headerTabsContainer; let tabsElem; - function enableTabsInFooter() { - return false; - } - - function ensureElements(enableInFooter) { - - if (enableInFooter) { - if (!footerTabsContainer) { - footerTabsContainer = document.createElement('div'); - footerTabsContainer.classList.add('footerTabs'); - footerTabsContainer.classList.add('sectionTabs'); - footerTabsContainer.classList.add('hide'); - } - } - + function ensureElements() { if (!headerTabsContainer) { headerTabsContainer = queryScope.querySelector('.headerTabs'); } @@ -97,9 +82,6 @@ import 'emby-button'; } export function setTabs(view, selectedIndex, getTabsFn, getTabContainersFn, onBeforeTabChange, onTabChange, setSelectedIndex) { - - const enableInFooter = enableTabsInFooter(); - if (!view) { if (tabOwnerView) { @@ -107,18 +89,13 @@ import 'emby-button'; headerTabsContainer = queryScope.querySelector('.headerTabs'); } - ensureElements(enableInFooter); + ensureElements(); document.body.classList.remove('withSectionTabs'); headerTabsContainer.innerHTML = ''; headerTabsContainer.classList.add('hide'); - if (footerTabsContainer) { - footerTabsContainer.innerHTML = ''; - footerTabsContainer.classList.add('hide'); - } - tabOwnerView = null; } return { @@ -127,9 +104,9 @@ import 'emby-button'; }; } - ensureElements(enableInFooter); + ensureElements(); - const tabsContainerElem = enableInFooter ? footerTabsContainer : headerTabsContainer; + const tabsContainerElem = headerTabsContainer; if (!tabOwnerView) { tabsContainerElem.classList.remove('hide'); diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js index 3c0495b887..9c408339b5 100644 --- a/src/components/multiSelect/multiSelect.js +++ b/src/components/multiSelect/multiSelect.js @@ -580,9 +580,6 @@ import 'css!./multiSelect'; dom.removeEventListener(element, 'touchend', onTouchEnd, { passive: true }); - dom.removeEventListener(element, 'touchcancel', onTouchEnd, { - passive: true - }); dom.removeEventListener(element, 'mousedown', onMouseDown, { passive: true }); diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js index 6a9e4a4cd3..b32c781482 100644 --- a/src/components/slideshow/slideshow.js +++ b/src/components/slideshow/slideshow.js @@ -131,9 +131,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f /** Last coordinates of the mouse pointer. */ var lastMouseMoveData; - // Use autoplay on Chromecast since it is non-interactive. - if (browser.chromecast) options.interactive = false; - /** * Creates the HTML markup for the dialog and the OSD. * @param {Object} options - Options used to create the dialog and slideshow. diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js index 682e99b201..f634faf1e9 100644 --- a/src/elements/emby-slider/emby-slider.js +++ b/src/elements/emby-slider/emby-slider.js @@ -12,8 +12,6 @@ import 'emby-input'; let supportsValueSetOverride = false; - let enableWidthWithTransform; - if (Object.getOwnPropertyDescriptor && Object.defineProperty) { const descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value'); @@ -104,12 +102,8 @@ import 'emby-input'; if (backgroundLower) { let fraction = (value - range.min) / (range.max - range.min); - if (enableWidthWithTransform) { - backgroundLower.style.transform = 'scaleX(' + (fraction) + ')'; - } else { - fraction *= 100; - backgroundLower.style.width = fraction + '%'; - } + fraction *= 100; + backgroundLower.style.width = fraction + '%'; } }); } @@ -146,11 +140,6 @@ import 'emby-input'; return; } - // TODO: Not sure what this is trying to accomplish. - if (enableWidthWithTransform == null) { - enableWidthWithTransform = browser.supportsCssAnimation(); - } - this.setAttribute('data-embyslider', 'true'); this.classList.add('mdl-slider'); @@ -178,11 +167,7 @@ import 'emby-input'; // the more of these, the more ranges we can display htmlToInsert += '
'; - if (enableWidthWithTransform) { - htmlToInsert += '
'; - } else { - htmlToInsert += '
'; - } + htmlToInsert += '
'; htmlToInsert += ''; htmlToInsert += ''; diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js index a9e0e9bfe6..30d89de3b1 100644 --- a/src/plugins/htmlVideoPlayer/plugin.js +++ b/src/plugins/htmlVideoPlayer/plugin.js @@ -32,13 +32,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa } } - // subs getting blocked due to CORS - if (browser.chromecast) { - if ((currentSrc || '').toLowerCase().indexOf('.m3u8') !== -1) { - return false; - } - } - if (browser.ps4) { return false; } @@ -306,35 +299,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa }); } - function setCurrentSrcChromecast(instance, elem, options, url) { - - elem.autoplay = true; - - var lrd = new cast.receiver.MediaManager.LoadRequestData(); - lrd.currentTime = (options.playerStartPositionTicks || 0) / 10000000; - lrd.autoplay = true; - lrd.media = new cast.receiver.media.MediaInformation(); - - lrd.media.contentId = url; - lrd.media.contentType = options.mimeType; - lrd.media.streamType = cast.receiver.media.StreamType.OTHER; - lrd.media.customData = options; - - console.debug('loading media url into media manager'); - - try { - mediaManager.load(lrd); - // This is needed in setCurrentTrackElement - self._currentSrc = url; - - return Promise.resolve(); - } catch (err) { - - console.debug('media manager error: ' + err); - return Promise.reject(); - } - } - // Adapted from : https://github.com/googlecast/CastReferencePlayer/blob/master/player.js function onMediaManagerLoadMedia(event) { @@ -433,9 +397,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa elem.crossOrigin = crossOrigin; } - if (browser.chromecast && val.indexOf('.m3u8') !== -1 && options.mediaSource.RunTimeTicks) { - return setCurrentSrcChromecast(self, elem, options, val); - } else if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) { + if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) { return setSrcWithHlsJs(self, elem, options, val); } else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') { @@ -1210,10 +1172,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa var html = ''; var cssClass = 'htmlvideoplayer'; - if (!browser.chromecast) { - cssClass += ' htmlvideoplayer-moveupsubtitles'; - } - // Can't autoplay in these browsers so we need to use the full controls, at least until playback starts if (!appHost.supports('htmlvideoautoplay')) { html += '