1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

updated nuget

This commit is contained in:
Luke Pulverenti 2015-07-06 03:06:09 -04:00
parent 75dba0b17f
commit 9e6d8b6c98
21 changed files with 257 additions and 96 deletions

View file

@ -181,7 +181,7 @@
var displayContextItem = card;
if (card.classList.contains('listviewMenuButton')) {
if (!card.classList.contains('card') && !card.classList.contains('listItem')) {
card = $(card).parents('.listItem,.card')[0];
}
@ -479,6 +479,46 @@
return false;
}
function onListViewPlayButtonClick(e) {
var playButton = this;
var card = this;
if (!card.classList.contains('card') && !card.classList.contains('listItem')) {
card = $(card).parents('.listItem,.card')[0];
}
var id = card.getAttribute('data-itemid');
var type = card.getAttribute('data-itemtype');
var isFolder = card.getAttribute('data-isfolder') == 'true';
var mediaType = card.getAttribute('data-mediatype');
var resumePosition = parseInt(card.getAttribute('data-resumeposition'));
if (type == 'MusicAlbum' || type == 'MusicArtist') {
isFolder = true;
}
LibraryBrowser.showPlayMenu(playButton, id, type, isFolder, mediaType, resumePosition);
e.preventDefault();
return false;
}
function isClickable(target) {
while (target != null) {
var tagName = target.tagName || '';
if (tagName == 'A' || tagName.indexOf('BUTTON') != -1) {
return true;
}
return false;
//target = target.parentNode;
}
return false;
}
function onGroupedCardClick(e) {
var card = this;
@ -496,7 +536,7 @@
};
var target = e.target;
if (target.tagName == 'A' || target.tagName == 'BUTTON') {
if (isClickable(target)) {
return;
}
@ -767,7 +807,7 @@
return;
}
if (targetElem.tagName == 'A' || targetElem.tagName == 'BUTTON') {
if (isClickable(targetElem)) {
return;
}
@ -838,7 +878,7 @@
});
}
function onHoverIn() {
function onHoverIn(e) {
if (preventHover === true) {
preventHover = false;
@ -852,6 +892,10 @@
var elem = this;
while (!elem.classList.contains('card')) {
elem = elem.parentNode;
}
showOverlayTimeout = setTimeout(function () {
onShowTimerExpired(elem);
@ -872,15 +916,21 @@
this.off('click', '.listviewMenuButton', onListViewMenuButtonClick);
this.on('click', '.listviewMenuButton', onListViewMenuButtonClick);
this.off('click', '.cardOverlayMoreButton', onListViewMenuButtonClick);
this.on('click', '.cardOverlayMoreButton', onListViewMenuButtonClick);
this.off('click', '.cardOverlayPlayButton', onListViewPlayButtonClick);
this.on('click', '.cardOverlayPlayButton', onListViewPlayButtonClick);
if (!AppInfo.isTouchPreferred) {
this.off('mouseenter', '.card:not(.bannerCard)', onHoverIn);
this.on('mouseenter', '.card:not(.bannerCard)', onHoverIn);
this.off('mouseenter', '.card:not(.bannerCard) .cardContent', onHoverIn);
this.on('mouseenter', '.card:not(.bannerCard) .cardContent', onHoverIn);
this.off('mouseleave', '.card:not(.bannerCard)', onHoverOut);
this.on('mouseleave', '.card:not(.bannerCard)', onHoverOut);
this.off('mouseleave', '.card:not(.bannerCard) .cardContent', onHoverOut);
this.on('mouseleave', '.card:not(.bannerCard) .cardContent', onHoverOut);
this.off("touchstart", '.card:not(.bannerCard)', preventTouchHover);
this.on("touchstart", '.card:not(.bannerCard)', preventTouchHover);
this.off("touchstart", '.card:not(.bannerCard) .cardContent', preventTouchHover);
this.on("touchstart", '.card:not(.bannerCard) .cardContent', preventTouchHover);
}
this.off('click', '.mediaItem', onCardClick);