';
}
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
@@ -787,7 +786,6 @@
var similarContent = page.querySelector('#similarContent');
similarContent.innerHTML = html;
ImageLoader.lazyChildren(similarContent);
- LibraryBrowser.createCardMenus(similarContent);
});
}
@@ -1006,8 +1004,6 @@
elem.classList.remove('hiddenScrollX');
}
- LibraryBrowser.createCardMenus(elem);
-
if (item.Type == "BoxSet") {
var collectionItemTypes = [
@@ -1112,11 +1108,6 @@
if (!items.length) {
renderCollectionItemType(page, parentItem, { name: Globalize.translate('HeaderItems') }, items);
}
-
- var containers = page.querySelectorAll('.collectionItems .itemsContainer');
- for (i = 0, length = containers.length; i < length; i++) {
- LibraryBrowser.createCardMenus(containers[i]);
- }
}
function renderCollectionItemType(page, parentItem, type, items) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index ba382daa97..85bea7d71c 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -903,7 +903,7 @@
atts.push({
name: 'serverid',
- value: item.ServerId
+ value: item.ServerId || options.serverId
});
atts.push({
@@ -1546,7 +1546,7 @@
anchorCssClass += ' mediaItem';
if (options.defaultAction) {
- anchorCssClass += ' itemWithAction';
+ anchorCssClass += ' itemAction';
}
var transition = options.transition === false || !AppInfo.enableSectionTransitions ? '' : ' data-transition="slide"';
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 5d3a78a32a..6f8201ceb5 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -216,45 +216,6 @@
return false;
}
- function onContextMenu(e) {
-
- var card = parentWithClass(e.target, 'card');
-
- if (card) {
- var itemSelectionPanel = card.querySelector('.itemSelectionPanel');
-
- if (!itemSelectionPanel) {
- showContextMenu(card, {});
- }
-
- e.preventDefault();
- return false;
- }
- }
-
- function deleteTimer(id, itemsContainer) {
-
- require(['confirm'], function (confirm) {
-
- confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation')).then(function () {
-
- Dashboard.showLoadingMsg();
-
- ApiClient.cancelLiveTvTimer(id).then(function () {
-
- require(['toast'], function (toast) {
- toast(Globalize.translate('MessageRecordingCancelled'));
- });
-
- Dashboard.hideLoadingMsg();
- itemsContainer.dispatchEvent(new CustomEvent('timercancelled', {
- bubbles: true
- }));
- });
- });
- });
- }
-
function showContextMenu(card, options) {
var displayContextItem = card;
@@ -525,14 +486,7 @@
curr.removeEventListener('click', onCardClick);
curr.addEventListener('click', onCardClick);
- if (AppInfo.isTouchPreferred) {
-
- curr.removeEventListener('contextmenu', disableEvent);
- curr.addEventListener('contextmenu', disableEvent);
- }
- else {
- curr.removeEventListener('contextmenu', onContextMenu);
- curr.addEventListener('contextmenu', onContextMenu);
+ if (!AppInfo.isTouchPreferred) {
curr.removeEventListener('mouseenter', onHoverIn);
curr.addEventListener('mouseenter', onHoverIn, true);
@@ -544,7 +498,7 @@
curr.addEventListener("touchstart", preventTouchHover);
}
- initTapHoldMenus(curr);
+ //initTapHoldMenus(curr);
};
function initTapHoldMenus(elem) {
@@ -616,12 +570,6 @@
});
}
- function disableEvent(e) {
- e.preventDefault();
- e.stopPropagation();
- return false;
- }
-
function onTapHold(e) {
var card = parentWithClass(e.target, 'card');
@@ -989,80 +937,6 @@
});
}
- function onItemWithActionClick(e) {
-
- var elem = parentWithClass(e.target, 'itemWithAction');
-
- if (!elem) {
- return;
- }
-
- var action = elem.getAttribute('data-action');
- var elemWithAttributes = elem;
-
- if (action) {
- while (!elemWithAttributes.getAttribute('data-itemid')) {
- elemWithAttributes = elemWithAttributes.parentNode;
- }
- }
-
- var index;
- var itemsContainer;
-
- var itemId = elemWithAttributes.getAttribute('data-itemid');
-
- if (action == 'play') {
- MediaController.play(itemId);
- }
- else if (action == 'playallfromhere') {
-
- index = elemWithAttributes.getAttribute('data-index');
-
- itemsContainer = parentWithClass(elem, 'itemsContainer');
-
- playAllFromHere(index, itemsContainer, 'play');
- }
- else if (action == 'instantmix') {
-
- MediaController.instantMix(itemId);
- }
-
- e.stopPropagation();
- e.preventDefault();
- return false;
- }
-
- function playAllFromHere(index, itemsContainer, method) {
-
- var ids = [];
-
- var mediaItems = itemsContainer.querySelectorAll('.mediaItem');
- for (var i = 0, length = mediaItems.length; i < length; i++) {
- var node = mediaItems[i];
- var id = node.getAttribute('data-itemid');
- while (!id) {
- node = node.parentNode;
- id = node.getAttribute('data-itemid');
- }
- ids.push(id);
- }
-
- ids = ids.slice(index);
-
- ApiClient.getItems(Dashboard.getCurrentUserId(), {
-
- Ids: ids.join(','),
- Fields: 'MediaSources,Chapters',
- Limit: 100
-
- }).then(function (result) {
-
- MediaController[method]({
- items: result.Items
- });
- });
- }
-
function showSyncButtonsPerUser(page) {
var apiClient = window.ApiClient;
@@ -1106,16 +980,8 @@
var page = this;
- page.addEventListener('click', onItemWithActionClick);
-
- var itemsContainers = page.querySelectorAll('.itemsContainer:not(.noautoinit)');
- var i, length;
- for (i = 0, length = itemsContainers.length; i < length; i++) {
- LibraryBrowser.createCardMenus(itemsContainers[i]);
- }
-
var categorySyncButtons = page.querySelectorAll('.categorySyncButton');
- for (i = 0, length = categorySyncButtons.length; i < length; i++) {
+ for (var i = 0, length = categorySyncButtons.length; i < length; i++) {
categorySyncButtons[i].addEventListener('click', onCategorySyncButtonClick);
}
});
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index 72da67bad0..50785f9275 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -1,4 +1,4 @@
-define([], function () {
+define(['emby-itemscontainer'], function () {
return function (view, params, tabContent) {
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 71ce7d3d84..11be75fa0b 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -1,4 +1,4 @@
-define([], function () {
+define(['emby-itemscontainer'], function () {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index b3b7cfc383..73f0c877c9 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -149,7 +149,6 @@
elem.querySelector('.recordingItems').innerHTML = html;
ImageLoader.lazyChildren(elem);
- LibraryBrowser.createCardMenus(elem);
});
}
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 6fe55a2bec..902d3f536b 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'scrollStyles'], function (libraryBrowser) {
+define(['libraryBrowser', 'scrollStyles', 'emby-itemscontainer'], function (libraryBrowser) {
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
@@ -133,7 +133,6 @@
} else {
containers[i].classList.remove('hiddenScrollX');
}
- LibraryBrowser.createCardMenus(containers[i]);
}
};
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 9ceba44654..7fc2816eb6 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'scrollStyles'], function (libraryBrowser) {
+define(['libraryBrowser', 'scrollStyles', 'emby-itemscontainer'], function (libraryBrowser) {
function getView() {
@@ -167,9 +167,9 @@
html += '';
if (enableScrollX()) {
- html += '