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 += '
'; - html += '
'; html += '

' + globalize.translate('HeaderMyMedia') + '

'; - html += '
'; html += '
'; @@ -317,8 +304,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '
'; if (enableScrollX()) { - html += '
'; - html += '
'; + html += '
'; + html += '
'; } else { html += '
'; } @@ -334,9 +321,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.fetchData = getFetchLatestItemsFn(apiClient.serverId(), parent.Id, parent.CollectionType); itemsContainer.getItemsHtml = getLatestItemsHtmlFn(parent.Type, parent.CollectionType); itemsContainer.parentContainer = elem; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } function loadRecentlyAdded(elem, apiClient, user, userViews) { @@ -370,15 +354,11 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la function loadLibraryTiles(elem, apiClient, user, userSettings, shape, userViews, allSections) { var html = ''; - if (userViews.length) { - html += '
'; - html += '

' + globalize.translate('HeaderMyMedia') + '

'; - html += '
'; - + html += '

' + globalize.translate('HeaderMyMedia') + '

'; if (enableScrollX()) { html += '
'; - html += '
'; + html += '
'; } else { html += '
'; } @@ -457,7 +437,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '

' + globalize.translate('HeaderContinueWatching') + '

'; if (enableScrollX()) { - html += '
'; + html += '
'; html += '
'; } else { html += '
'; @@ -475,9 +455,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.fetchData = getContinueWatchingFetchFn(apiClient.serverId()); itemsContainer.getItemsHtml = getContinueWatchingItemsHtml; itemsContainer.parentContainer = elem; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } function getContinueListeningFetchFn(serverId) { @@ -533,7 +510,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '

' + globalize.translate('HeaderContinueWatching') + '

'; if (enableScrollX()) { - html += '
'; + html += '
'; html += '
'; } else { html += '
'; @@ -551,9 +528,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.fetchData = getContinueListeningFetchFn(apiClient.serverId()); itemsContainer.getItemsHtml = getContinueListeningItemsHtml; itemsContainer.parentContainer = elem; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } function getOnNowFetchFn(serverId) { @@ -623,9 +597,9 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la if (enableScrollX()) { html += '
'; - html += '
'; + html += '
'; } else { - html += '
'; + html += '
'; } html += ''; - html += '
' + html += '
'; + html += '
' } else { - html += '
'; + html += '
'; } if (enableScrollX()) { @@ -697,9 +671,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.parentContainer = elem; itemsContainer.fetchData = getOnNowFetchFn(apiClient.serverId()); itemsContainer.getItemsHtml = getOnNowItemsHtml; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } }); } @@ -755,7 +726,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '
'; if (enableScrollX()) { - html += '
'; + html += '
'; html += '
' } else { html += '
'; @@ -773,9 +744,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.fetchData = getNextUpFetchFn(apiClient.serverId()); itemsContainer.getItemsHtml = getNextUpItemsHtml; itemsContainer.parentContainer = elem; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) { @@ -830,7 +798,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '
'; if (enableScrollX()) { - html += '
'; + html += '
'; html += '
' } else { html += '
'; @@ -848,9 +816,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la itemsContainer.fetchData = getLatestRecordingsFetchFn(apiClient.serverId(), activeRecordingsOnly); itemsContainer.getItemsHtml = getLatestRecordingItemsHtml(activeRecordingsOnly); itemsContainer.parentContainer = elem; - - var scroller = elem.querySelector('.emby-scroller'); - itemsContainer.afterRefresh = scroller.afterRefresh; } return { diff --git a/src/components/scroller.js b/src/components/scroller.js index cfa1e07a00..de0ce6b932 100644 --- a/src/components/scroller.js +++ b/src/components/scroller.js @@ -299,13 +299,10 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc } // Start animation rendering - if (newPos !== pos.dest) { - pos.dest = newPos; - - renderAnimateWithTransform(from, newPos, immediate); - - lastAnimate = now; - } + // NOTE the dependency was modified here to fix a scrollbutton issue + pos.dest = newPos; + renderAnimateWithTransform(from, newPos, immediate); + lastAnimate = now; }; function setStyleProperty(elem, name, value, speed, resetTransition) { diff --git a/src/css/librarybrowser.css b/src/css/librarybrowser.css index 9fac59c895..f0f3cb9b23 100644 --- a/src/css/librarybrowser.css +++ b/src/css/librarybrowser.css @@ -960,11 +960,11 @@ } .padded-left { - padding-left: 4em; + padding-left: 3.3%; } .padded-right { - padding-right: 4em; + padding-right: 3.3%; } .padded-top { diff --git a/src/itemdetails.html b/src/itemdetails.html index e6c06bbe55..2335feb3ef 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -207,9 +207,7 @@
-

- ${HeaderNextUp} -

+

${HeaderNextUp}

@@ -224,9 +222,7 @@
-

- ${HeaderAdditionalParts} -

+

${HeaderAdditionalParts}

@@ -247,11 +243,9 @@
-
-

- ${HeaderCastCrew} -

+

${HeaderCastCrew}

+