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

remove jquery from librarybrowser.js

This commit is contained in:
Luke Pulverenti 2016-05-29 02:04:11 -04:00
parent 728f77be94
commit fac1b1d5f9
4 changed files with 59 additions and 41 deletions

View file

@ -21,7 +21,6 @@ iron-list .card {
top: 0; top: 0;
background-color: rgba(0, 0, 0, .85); background-color: rgba(0, 0, 0, .85);
z-index: 998; z-index: 998;
display: none;
line-height: initial; line-height: initial;
} }

View file

@ -1,4 +1,4 @@
define(['scrollHelper', 'appSettings', 'appStorage', 'apphost', 'datetime', 'jQuery', 'itemHelper', 'mediaInfo', 'scrollStyles'], function (scrollHelper, appSettings, appStorage, appHost, datetime, $, itemHelper, mediaInfo) { define(['scrollHelper', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scrollStyles'], function (scrollHelper, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo) {
function parentWithClass(elem, className) { function parentWithClass(elem, className) {
@ -381,7 +381,9 @@
if (window.location.href.toLowerCase().indexOf(url.toLowerCase()) != -1) { if (window.location.href.toLowerCase().indexOf(url.toLowerCase()) != -1) {
if (window.$) {
afterNavigate.call($.mobile.activePage); afterNavigate.call($.mobile.activePage);
}
} else { } else {
pageClassOn('pagebeforeshow', 'page', afterNavigate); pageClassOn('pagebeforeshow', 'page', afterNavigate);
@ -1689,8 +1691,12 @@
default: default:
break; break;
} }
var div = $('<div class="card ' + shape + 'Card"><div class="cardBox"><div class="cardImage"></div></div></div>').appendTo(document.body); var div = document.createElement('div');
var innerWidth = $('.cardImage', div).innerWidth(); div.classList.add('card');
div.classList.add(shape + 'Card');
div.innerHTML = '<div class="cardBox"><div class="cardImage"></div></div>';
document.body.appendChild(div);
var innerWidth = div.querySelector('.cardImage').clientWidth;
if (!innerWidth || isNaN(innerWidth)) { if (!innerWidth || isNaN(innerWidth)) {
cache = false; cache = false;
@ -2851,10 +2857,9 @@
})); }));
if (!dispatchEvent) { if (!dispatchEvent) {
// TODO: remove jQuery if (window.$) {
require(['jQuery'], function ($) {
$(button).trigger('layoutchange', [id]); $(button).trigger('layoutchange', [id]);
}); }
} }
} }
}); });
@ -3105,22 +3110,17 @@
markFavorite: function (link) { markFavorite: function (link) {
// TODO: remove jQuery
require(['jQuery'], function ($) {
var id = link.getAttribute('data-itemid'); var id = link.getAttribute('data-itemid');
var $link = $(link); var markAsFavorite = !link.classList.contains('btnUserItemRatingOn');
var markAsFavorite = !$link.hasClass('btnUserItemRatingOn');
ApiClient.updateFavoriteStatus(Dashboard.getCurrentUserId(), id, markAsFavorite); ApiClient.updateFavoriteStatus(Dashboard.getCurrentUserId(), id, markAsFavorite);
if (markAsFavorite) { if (markAsFavorite) {
$link.addClass('btnUserItemRatingOn'); link.classList.add('btnUserItemRatingOn');
} else { } else {
$link.removeClass('btnUserItemRatingOn'); link.classList.remove('btnUserItemRatingOn');
} }
});
}, },
renderDetailImage: function (elem, item, editable, preferThumb) { renderDetailImage: function (elem, item, editable, preferThumb) {

View file

@ -618,7 +618,7 @@
LibraryBrowser.playInExternalPlayer(itemId); LibraryBrowser.playInExternalPlayer(itemId);
break; break;
case 'canceltimer': case 'canceltimer':
deleteTimer(itemId, $(card).parents('.itemsContainer')[0]); deleteTimer(itemId, parentWithClass(card, 'itemsContainer'));
break; break;
case 'share': case 'share':
require(['sharingmanager'], function (sharingManager) { require(['sharingmanager'], function (sharingManager) {
@ -629,10 +629,16 @@
}); });
break; break;
case 'removefromplaylist': case 'removefromplaylist':
$(card).parents('.itemsContainer').trigger('removefromplaylist', [playlistItemId]); var itemsContainer = parentWithClass(card, 'itemsContainer');
if (itemsContainer) {
$(itemsContainer).trigger('removefromplaylist', [playlistItemId]);
}
break; break;
case 'removefromcollection': case 'removefromcollection':
var itemsContainer = parentWithClass(card, 'itemsContainer');
if (itemsContainer) {
$(card).parents('.collectionItems').trigger('removefromcollection', [itemId]); $(card).parents('.collectionItems').trigger('removefromcollection', [itemId]);
}
break; break;
default: default:
break; break;
@ -732,9 +738,11 @@
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();
var playedIndicator = card.querySelector('.playedIndicator');
var playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null;
var options = { var options = {
Limit: parseInt($('.playedIndicator', card).html() || '10'), Limit: parseInt(playedIndicatorHtml || '10'),
Fields: "PrimaryImageAspectRatio,DateCreated", Fields: "PrimaryImageAspectRatio,DateCreated",
ParentId: itemId, ParentId: itemId,
GroupItems: false GroupItems: false
@ -823,13 +831,20 @@
innerElem.innerHTML = getOverlayHtml(item, user, card, commands); innerElem.innerHTML = getOverlayHtml(item, user, card, commands);
$('.btnPlayItem', innerElem).on('click', onPlayItemButtonClick); var btnPlayItem = innerElem.querySelector('.btnPlayItem');
$('.btnPlayTrailer', innerElem).on('click', onTrailerButtonClick); if (btnPlayItem) {
$('.btnMoreCommands', innerElem).on('click', onMoreButtonClick); btnPlayItem.addEventListener('click', onPlayItemButtonClick);
}
var btnPlayTrailer = innerElem.querySelector('.btnPlayTrailer');
if (btnPlayTrailer) {
btnPlayTrailer.addEventListener('click', onTrailerButtonClick);
}
var btnMoreCommands = innerElem.querySelector('.btnMoreCommands');
if (btnMoreCommands) {
btnMoreCommands.addEventListener('click', onMoreButtonClick);
}
}); });
$(innerElem).show();
slideUpToShow(innerElem); slideUpToShow(innerElem);
} }
@ -1530,21 +1545,28 @@
} }
var progressHtml = LibraryBrowser.getItemProgressBarHtml(userData); var progressHtml = LibraryBrowser.getItemProgressBarHtml(userData);
var cardProgress;
if (progressHtml) { if (progressHtml) {
var cardProgress = card.querySelector('.cardProgress'); cardProgress = card.querySelector('.cardProgress');
if (!cardProgress) { if (!cardProgress) {
cardProgress = document.createElement('div'); cardProgress = document.createElement('div');
cardProgress.classList.add('cardProgress'); cardProgress.classList.add('cardProgress');
$('.cardFooter', card).append(cardProgress); var cardFooter = card.querySelector('.cardFooter');
if (cardFooter) {
cardFooter.appendChild(cardProgress);
}
} }
cardProgress.innerHTML = progressHtml; cardProgress.innerHTML = progressHtml;
} }
else { else {
$('.cardProgress', card).remove(); cardProgress = card.querySelector('.cardFooter');
if (cardProgress) {
cardProgress.parentNode.removeChild(cardProgress);
}
} }
} }
@ -1585,10 +1607,6 @@
Events.on(apiClient, "websocketmessage", onWebSocketMessage); Events.on(apiClient, "websocketmessage", onWebSocketMessage);
} }
function clearRefreshTimes() {
$('.hasrefreshtime').removeClass('hasrefreshtime').removeAttr('data-lastrefresh');
}
if (window.ApiClient) { if (window.ApiClient) {
initializeApiClient(window.ApiClient); initializeApiClient(window.ApiClient);
} }
@ -1597,7 +1615,4 @@
initializeApiClient(apiClient); initializeApiClient(apiClient);
}); });
Events.on(ConnectionManager, 'localusersignedin', clearRefreshTimes);
Events.on(ConnectionManager, 'localusersignedout', clearRefreshTimes);
}); });

View file

@ -1166,7 +1166,11 @@ var Dashboard = {
// The native app can handle a little bit more than safari // The native app can handle a little bit more than safari
if (AppInfo.isNativeApp) { if (AppInfo.isNativeApp) {
if (isBackdrop) {
quality -= 5;
} else {
quality -= 10; quality -= 10;
}
} else { } else {