diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index c035766018..417922fc7e 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -877,10 +877,6 @@ atts.push('data-locationtype="' + (item.LocationType || '') + '"'); atts.push('data-index="' + index + '"'); - if (item.IsPlaceHolder) { - atts.push('data-placeholder="true"'); - } - var html = atts.join(' '); if (html) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 470e2d6946..28fe0ab5e3 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -374,7 +374,6 @@ var playbackPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0'); var playAccess = card.getAttribute('data-playaccess'); var locationType = card.getAttribute('data-locationtype'); - var isPlaceHolder = card.getAttribute('data-placeholder') == 'true'; var index = card.getAttribute('data-index'); $(card).addClass('hasContextMenu'); @@ -413,7 +412,7 @@ if (options.showPlayOptions !== false) { - if (MediaController.canPlayByAttributes(itemType, mediaType, playAccess, locationType, isPlaceHolder)) { + if (MediaController.canPlayByAttributes(itemType, mediaType, playAccess, locationType)) { html += '
  • ' + Globalize.translate('ButtonPlay') + '
  • '; if (commands.indexOf('playfromhere') != -1) { diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index dd90f33dcb..ab70725f54 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -210,16 +210,16 @@ self.canPlay = function (item) { - return self.canPlayByAttributes(item.Type, item.MediaType, item.PlayAccess, item.LocationType, item.IsPlaceHolder); + return self.canPlayByAttributes(item.Type, item.MediaType, item.PlayAccess, item.LocationType); }; - self.canPlayByAttributes = function (itemType, mediaType, playAccess, locationType, isPlaceHolder) { + self.canPlayByAttributes = function (itemType, mediaType, playAccess, locationType) { if (playAccess != 'Full') { return false; } - if (locationType == "Virtual" || isPlaceHolder) { + if (locationType == "Virtual") { return false; } diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html index 941e2f585e..684de14615 100644 --- a/dashboard-ui/selectserver.html +++ b/dashboard-ui/selectserver.html @@ -12,7 +12,7 @@

    ${HeaderSelectServer}

    - + ${ButtonHelp} diff --git a/dashboard-ui/thirdparty/apiclient/deferredAlt.js b/dashboard-ui/thirdparty/apiclient/alt/deferred.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/deferredAlt.js rename to dashboard-ui/thirdparty/apiclient/alt/deferred.js diff --git a/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/apiclient/apiclient.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js rename to dashboard-ui/thirdparty/apiclient/apiclient.js