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

update multi-select

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-18 13:45:14 -04:00
parent b4f87ddb3a
commit 4035ba7066
4 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js vendored
View file

@ -25,7 +25,7 @@
showOverlayTimeout = null; showOverlayTimeout = null;
} }
elem = elem.querySelector('.cardOverlayTarget'); elem = elem.classList.contains('cardOverlayTarget') ? elem : elem.querySelector('.cardOverlayTarget');
if (elem) { if (elem) {
slideDownToHide(elem); slideDownToHide(elem);
@ -186,10 +186,10 @@
innerElem.classList.add('hide'); innerElem.classList.add('hide');
innerElem.classList.add('cardOverlayTarget'); innerElem.classList.add('cardOverlayTarget');
(elem.querySelector('.cardContent') || elem.querySelector('.cardBox')).appendChild(innerElem); elem.parentNode.appendChild(innerElem);
} }
var dataElement = elem; var dataElement = parentWithAttribute(elem, 'data-id');
var id = dataElement.getAttribute('data-id'); var id = dataElement.getAttribute('data-id');
var type = dataElement.getAttribute('data-type'); var type = dataElement.getAttribute('data-type');
@ -209,9 +209,7 @@
var item = responses[0]; var item = responses[0];
var user = responses[1]; var user = responses[1];
var card = elem; innerElem.innerHTML = getOverlayHtml(apiClient, item, user, dataElement);
innerElem.innerHTML = getOverlayHtml(apiClient, item, user, card);
}); });
slideUpToShow(innerElem); slideUpToShow(innerElem);
@ -220,18 +218,12 @@
function onHoverIn(e) { function onHoverIn(e) {
var elem = e.target; var elem = e.target;
var card = parentWithClass(elem, 'card'); var card = parentWithClass(elem, 'cardImageContainer') || parentWithClass(elem, 'cardImage');
if (!card) { if (!card) {
return; return;
} }
elem = card.querySelector('.cardImage,.cardImageContainer');
if (!elem) {
return;
}
if (preventHover === true) { if (preventHover === true) {
preventHover = false; preventHover = false;
return; return;
@ -242,10 +234,8 @@
showOverlayTimeout = null; showOverlayTimeout = null;
} }
elem = parentWithAttribute(elem, 'data-id');
showOverlayTimeout = setTimeout(function () { showOverlayTimeout = setTimeout(function () {
onShowTimerExpired(elem); onShowTimerExpired(card);
}, 1000); }, 1000);
} }

22
dashboard-ui/bower_components/emby-webcomponents/multiselect/multiselect.js vendored
View file

@ -1,4 +1,4 @@
define(['browser', 'apphost', 'loading', 'connectionManager', 'globalize', 'embyRouter', 'css!./multiselect'], function (browser, appHost, loading, connectionManager, globalize, embyRouter) { define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'embyRouter', 'css!./multiselect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, embyRouter) {
var selectedItems = []; var selectedItems = [];
var selectedElements = []; var selectedElements = [];
@ -34,17 +34,17 @@
} }
} }
var initCount = 0;
function showTapHoldHelp(element) { function showTapHoldHelp(element) {
return; if (initCount >= 15) {
var page = parentWithClass(element, 'page'); // All done
if (!page) {
return; return;
} }
// Don't do this on the home page initCount++;
if (page.classList.contains('homePage') || page.classList.contains('itemDetailPage') || page.classList.contains('liveTvPage')) {
if (initCount < 15) {
return; return;
} }
@ -55,9 +55,11 @@
appStorage.setItem("tapholdhelp", expectedValue); appStorage.setItem("tapholdhelp", expectedValue);
Dashboard.alert({ require(['alert'], function (alert) {
message: globalize.translate('TryMultiSelectMessage'), alert({
title: globalize.translate('HeaderTryMultiSelect') text: globalize.translate('sharedcomponents#TryMultiSelectMessage'),
title: globalize.translate('sharedcomponents#TryMultiSelect')
});
}); });
} }

13
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View file

@ -249,6 +249,19 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
editItem(item, serverId); editItem(item, serverId);
}); });
} }
else if (action == 'playtrailer') {
getItem(target).then(playTrailer);
}
}
function playTrailer(item) {
var apiClient = connectionManager.getApiClient(item.ServerId);
apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(function (trailers) {
playbackManager.play({ items: trailers });
});
} }
function editItem(item, serverId) { function editItem(item, serverId) {

2
dashboard-ui/strings/en-US.json
View file

@ -2279,8 +2279,6 @@
"TextPleaseEnterYourEmailAddressForSubscription": "Please enter your e-mail address.", "TextPleaseEnterYourEmailAddressForSubscription": "Please enter your e-mail address.",
"LoginDisclaimer": "Emby is designed to help you manage your personal media library, such as home videos and photos. Please see our terms of use. The use of any Emby software constitutes acceptance of these terms.", "LoginDisclaimer": "Emby is designed to help you manage your personal media library, such as home videos and photos. Please see our terms of use. The use of any Emby software constitutes acceptance of these terms.",
"TermsOfUse": "Terms of use", "TermsOfUse": "Terms of use",
"HeaderTryMultiSelect": "Try Multi-Select",
"TryMultiSelectMessage": "To edit multiple media items, just click and hold any poster and select the items you want to manage. Try it!",
"NumLocationsValue": "{0} folders", "NumLocationsValue": "{0} folders",
"ButtonAddMediaLibrary": "Add Media Library", "ButtonAddMediaLibrary": "Add Media Library",
"ButtonManageFolders": "Manage folders", "ButtonManageFolders": "Manage folders",