';
-
- html += '
';
- html += LibraryBrowser.getMiscInfoHtml(item);
- html += '
';
-
- html += '
';
- html += '';
- html += '
';
-
- html += '
';
- html += '';
- html += LibraryBrowser.getUserDataIconsHtml(item);
- html += '';
- html += '
';
-
- html += '
';
- html += (item.OverviewHtml || item.Overview || '');
- html += '
';
-
- html += '
';
-
- html += '';
- html += '';
- html += '';
- html += '';
-
- html += '
';
-
- html += '
';
-
- return html;
- }
-
- function showOverlay(elem, item) {
-
- $('.itemFlyout').popup('close').remove();
-
- var html = '';
-
- html += '
';
- html += '
' + LibraryBrowser.getPosterViewDisplayName(item, true) + '
';
- html += '';
-
- html += '
';
- html += getOverlayHtml(item);
- html += '
';
-
- html += '
';
-
- $('.itemFlyout').popup('close').popup('destroy').remove();
-
- $(document.body).append(html);
-
- var popup = $('.itemFlyout').on('mouseenter', onOverlayMouseOver).on('mouseleave', onOverlayMouseOut).popup({
-
- positionTo: $('.posterItemOverlayTarget', elem)
-
- }).trigger('create').popup("open").on("popupafterclose", function () {
-
- $(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove();
- });
-
- popup.parents().prev('.ui-popup-screen').remove();
- currentPosterItem = elem;
- }
-
- function onPosterItemClicked() {
-
- if (showOverlayTimeout) {
- clearTimeout(showOverlayTimeout);
- showOverlayTimeout = null;
- }
-
- if (hideOverlayTimeout) {
- clearTimeout(hideOverlayTimeout);
- hideOverlayTimeout = null;
- }
-
- hideOverlay();
- }
-
- function hideOverlay() {
-
- $('.itemFlyout').popup('close').remove();
-
- if (currentPosterItem) {
-
- $(currentPosterItem).off('click.overlay');
- currentPosterItem = null;
- }
- }
-
- function startHideOverlayTimer() {
-
- if (hideOverlayTimeout) {
- clearTimeout(hideOverlayTimeout);
- hideOverlayTimeout = null;
- }
-
- hideOverlayTimeout = setTimeout(hideOverlay, 400);
- }
-
- function onHoverOut() {
-
- if (showOverlayTimeout) {
- clearTimeout(showOverlayTimeout);
- showOverlayTimeout = null;
- }
-
- startHideOverlayTimer();
- }
-
- $.fn.createPosterItemHoverMenu = function () {
-
- function onShowTimerExpired(elem) {
-
- var id = elem.getAttribute('data-itemid');
-
- ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) {
-
- showOverlay(elem, item);
-
- });
- }
-
- function onHoverIn() {
-
- if (showOverlayTimeout) {
- clearTimeout(showOverlayTimeout);
- showOverlayTimeout = null;
- }
-
- if (hideOverlayTimeout) {
- clearTimeout(hideOverlayTimeout);
- hideOverlayTimeout = null;
- }
-
- var elem = this;
-
- if (currentPosterItem && currentPosterItem == elem) {
- return;
- }
-
- showOverlayTimeout = setTimeout(function () {
-
- onShowTimerExpired(elem);
-
- }, 300);
- }
-
- // https://hacks.mozilla.org/2013/04/detecting-touch-its-the-why-not-the-how/
-
- if (('ontouchstart' in window) || (navigator.maxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0)) {
- /* browser with either Touch Events of Pointer Events
- running on touch-capable device */
- return this;
- }
-
- return this.on('mouseenter', '.posterItem', onHoverIn)
- .on('mouseleave', '.posterItem', onHoverOut)
- .on('click', '.posterItem', onPosterItemClicked);
- };
-
-})(jQuery, document, window);
-
(function ($, document, window) {
var showOverlayTimeout;
@@ -2673,7 +2482,7 @@
var name = LibraryBrowser.getPosterViewDisplayName(item, true);
html += '';
- var logoHeight = isPortrait || isSmallItem ? 20 : 22;
+ var logoHeight = isSmallItem ? 20 : 24;
var maxLogoWidth = isPortrait ? 100 : 200;
var imgUrl;
@@ -2711,7 +2520,7 @@
html += '';
}
- html += '
';
+ html += '
';
html += '';
@@ -2753,7 +2562,7 @@
}
if (!isPortrait || buttonCount < 3) {
- html += '';
+ html += '';
}
html += '
';
@@ -2830,7 +2639,7 @@
onShowTimerExpired(elem);
- }, 800);
+ }, 1000);
}
// https://hacks.mozilla.org/2013/04/detecting-touch-its-the-why-not-the-how/
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 1583f1620..20483cc9f 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -13,7 +13,31 @@
}
$('#selectGuideDays', page).val(config.LiveTvOptions.GuideDays || '').selectmenu('refresh');
-
+
+ var serviceOptions = liveTvInfo.Services.map(function (s) {
+ return '';
@@ -90,7 +90,7 @@
html += '
';
- html += '
';
+ html += '
';
html += '';
@@ -454,10 +454,10 @@
var html = '';
html += '
';
- html += '
';
+ html += '
';
html += '
';
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 2692f4eaf..a648320ec 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -19,7 +19,7 @@
} else {
$('.supporterOnly', page).hide();
}
- $('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterkey.html"));
+ $('#paypalReturnUrl', page).val(ApiClient.getUrl("supporterkey.html"));
Dashboard.hideLoadingMsg();
});
}
diff --git a/dashboard-ui/scripts/wizardimagesettings.js b/dashboard-ui/scripts/wizardimagesettings.js
index 0a7c20c27..0de21355d 100644
--- a/dashboard-ui/scripts/wizardimagesettings.js
+++ b/dashboard-ui/scripts/wizardimagesettings.js
@@ -11,8 +11,6 @@
config.ImageSavingConvention = $('#selectImageSavingConvention', page).val();
config.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked();
- config.EnableEpisodeChapterImageExtraction = $('#chkEpisodes', page).checked();
- config.EnableOtherVideoChapterImageExtraction = $('#chkOtherVideos', page).checked();
ApiClient.updateServerConfiguration(config).done(function (result) {
diff --git a/dashboard-ui/wizardimagesettings.html b/dashboard-ui/wizardimagesettings.html
index eed113701..0b2a71409 100644
--- a/dashboard-ui/wizardimagesettings.html
+++ b/dashboard-ui/wizardimagesettings.html
@@ -29,18 +29,9 @@
-
-
-
-
-
-
-
-
-
-
-
Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.
-
+
+
+
Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.