From b16f98ce9f50e5b24e2e874cc46f2ca92c88f7e1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Feb 2014 00:35:56 -0500 Subject: [PATCH] rework EnableMediaPlayback --- dashboard-ui/scripts/itemdetailpage.js | 6 +++--- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/mediaplayer.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index cd6884741d..7d84c9d8ca 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -54,7 +54,7 @@ $('#playExternalButtonContainer', page).hide(); } - if (item.LocalTrailerCount && item.LocationType !== "Offline" && user.Configuration.EnableMediaPlayback) { + if (item.LocalTrailerCount && item.LocationType !== "Offline" && item.PlayAccess == 'Full') { $('#trailerButtonContainer', page).show(); } else { $('#trailerButtonContainer', page).hide(); @@ -823,7 +823,7 @@ var chapter = chapters[i]; var chapterName = chapter.Name || "Chapter " + i; - var onclick = user.Configuration.EnableMediaPlayback ? ' onclick="ItemDetailPage.play(' + chapter.StartPositionTicks + ');"' : ''; + var onclick = item.PlayAccess == 'Full' ? ' onclick="ItemDetailPage.play(' + chapter.StartPositionTicks + ');"' : ''; html += ''; @@ -952,7 +952,7 @@ var href = "itemdetails.html?id=" + item.Id; - var onclick = user.Configuration.EnableMediaPlayback ? ' onclick="MediaPlayer.playById(\'' + item.Id + '\'); return false;"' : ""; + var onclick = item.PlayAccess == 'Full' ? ' onclick="MediaPlayer.playById(\'' + item.Id + '\'); return false;"' : ""; html += ''; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 290a28e0aa..854318d1a6 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -2561,7 +2561,7 @@ } } - if (item.LocalTrailerCount && currentUser.Configuration.EnableMediaPlayback) { + if (item.LocalTrailerCount && item.PlayAccess == 'Full') { html += ''; buttonCount++; } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 50d89d874f..21319b1e74 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -1009,7 +1009,7 @@ self.canPlay = function (item, user) { - if (!user.Configuration.EnableMediaPlayback) { + if (item.PlayAccess != 'Full') { return false; }