milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

re-org scripts

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-25 14:29:21 -04:00
parent 9fecb9f7c4
commit d2f14592e9
6 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -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) {

3
dashboard-ui/scripts/librarylist.js
View file

@ -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 += '<li data-icon="play"><a href="#" class="btnPlay" data-itemid="' + itemId + '">' + Globalize.translate('ButtonPlay') + '</a></li>';
if (commands.indexOf('playfromhere') != -1) {

6
dashboard-ui/scripts/mediacontroller.js
View file

@ -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;
}