diff --git a/src/components/emby-scrollbuttons/emby-scrollbuttons.js b/src/components/emby-scrollbuttons/emby-scrollbuttons.js index 50678068e9..7be865098a 100644 --- a/src/components/emby-scrollbuttons/emby-scrollbuttons.js +++ b/src/components/emby-scrollbuttons/emby-scrollbuttons.js @@ -33,8 +33,8 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', ' } function updateScrollButtons(scrollButtons, scrollSize, scrollPos, scrollWidth) { - // hack alert add ten for rounding errors - if (scrollWidth <= scrollSize + 10) { + // hack alert add twenty for rounding errors + if (scrollWidth <= scrollSize + 20) { scrollButtons.scrollButtonsLeft.classList.add('hide'); scrollButtons.scrollButtonsRight.classList.add('hide'); } @@ -131,14 +131,6 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', ' scroller.scrollToPosition(newPos, false); } - EmbyScrollButtonsPrototype.refresh = function (scroller) { - var scrollSize = getScrollSize(scroller); - var scrollPos = getScrollPosition(scroller); - var scrollWidth = getScrollWidth(scroller); - - updateScrollButtons(this, scrollSize, scrollPos, scrollWidth); - } - EmbyScrollButtonsPrototype.attachedCallback = function () { var scroller = this.nextSibling; var parent = this.parentNode; diff --git a/src/components/emby-scroller/emby-scroller.js b/src/components/emby-scroller/emby-scroller.js index 391728dda2..df6e1beec8 100644 --- a/src/components/emby-scroller/emby-scroller.js +++ b/src/components/emby-scroller/emby-scroller.js @@ -184,14 +184,6 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro } }; - ScrollerPrototype.afterRefresh = function () { - var buttons = this.parentNode.parentNode.querySelector('.emby-scrollbuttons'); - if (buttons) { - this.parentNode.scroller.reload(); - buttons.refresh(this.parentNode); - } - } - ScrollerPrototype.detachedCallback = function () { if (this.getAttribute('data-navcommands')) { inputManager.off(this, onInputCommand); diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index c7637e4bd0..b7da2708f3 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -91,7 +91,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la } var promise = Promise.all(promises); - if (!options || options.returnPromise !== false) { return promise; } @@ -106,32 +105,22 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la if (section === 'latestmedia') { loadRecentlyAdded(elem, apiClient, user, userViews); - } - else if (section === 'librarytiles' || section === 'smalllibrarytiles' || section === 'smalllibrarytiles-automobile' || section === 'librarytiles-automobile') { + } else if (section === 'librarytiles' || section === 'smalllibrarytiles' || section === 'smalllibrarytiles-automobile' || section === 'librarytiles-automobile') { loadLibraryTiles(elem, apiClient, user, userSettings, 'smallBackdrop', userViews, allSections); - } - else if (section === 'librarybuttons') { + } else if (section === 'librarybuttons') { loadlibraryButtons(elem, apiClient, user, userSettings, userViews, allSections); - } - else if (section === 'resume') { + } else if (section === 'resume') { loadResumeVideo(elem, apiClient, userId); - } - else if (section === 'resumeaudio') { + } else if (section === 'resumeaudio') { loadResumeAudio(elem, apiClient, userId); - } - else if (section === 'activerecordings') { + } else if (section === 'activerecordings') { loadLatestLiveTvRecordings(elem, true, apiClient, userId); - } - else if (section === 'nextup') { + } else if (section === 'nextup') { loadNextUp(elem, apiClient, userId); - } - else if (section === 'onnow' || section === 'livetv') { + } else if (section === 'onnow' || section === 'livetv') { return loadOnNow(elem, apiClient, user); - } - else { - + } else { elem.innerHTML = ''; - return Promise.resolve(); } return Promise.resolve(); @@ -163,9 +152,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la var html = ""; html += '