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

update listviews

This commit is contained in:
Luke Pulverenti 2016-07-16 14:02:39 -04:00
parent 1032fa887e
commit f458196922
31 changed files with 168 additions and 100 deletions

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'listView'], function (events, libraryBrowser, imageLoader, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['listView'], function (listView) {
define(['listView', 'emby-itemscontainer'], function (listView) {
function renderItems(page, item) {
@ -82,7 +82,7 @@
html += '<a href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><button is="emby-button" type="button" class="raised more mini noIcon">' + Globalize.translate('ButtonMore') + '</button></a>';
html += '</div>';
html += '<div class="itemsContainer">';
html += '<div is="emby-itemscontainer" class="itemsContainer">';
html += '</div>';
html += '</div>';

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'alphaPicker', 'listView'], function (libraryBrowser, alphaPicker, listView) {
define(['libraryBrowser', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (libraryBrowser, alphaPicker, listView) {
return function (view, params) {

View file

@ -254,12 +254,15 @@
var displayContextItem = card;
if (!card.classList.contains('card') && !card.classList.contains('listItem')) {
card = parentWithAnyClass(card, ['listItem', 'card']);
card = parentWithClass(card, 'card');
if (!card) {
return;
}
var itemId = card.getAttribute('data-itemid');
var playlistItemId = card.getAttribute('data-playlistitemid');
var commands = card.getAttribute('data-commands').split(',');
var itemType = card.getAttribute('data-itemtype');
var mediaType = card.getAttribute('data-mediatype');

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {

View file

@ -67,37 +67,30 @@
showRemoveFromPlaylist: true,
playFromHere: true,
action: 'playallfromhere',
smallIcon: true
smallIcon: true,
dragHandle: true
});
}
var elem = page.querySelector('#childrenContent .itemsContainer');
elem.innerHTML = html;
var listItems = [];
var elems = elem.querySelectorAll('.listItem');
for (var i = 0, length = elems.length; i < length; i++) {
listItems.push(elems[i]);
}
var listParent = elem;
var listParent = elem.querySelector('.paperList');
require(['sortable'], function (Sortable) {
if (!AppInfo.isTouchPreferred) {
require(['sortable'], function (Sortable) {
var sortable = new Sortable(listParent, {
var sortable = new Sortable(listParent, {
draggable: ".listItem",
handle: '.listViewDragHandle',
draggable: ".listItem",
// dragging ended
onEnd: function (/**Event*/evt) {
// dragging ended
onEnd: function (/**Event*/evt) {
onDrop(evt, page, item);
}
});
onDrop(evt, page, item);
}
});
}
});
ImageLoader.lazyChildren(elem);
LibraryBrowser.createCardMenus(elem);
@ -117,14 +110,13 @@
function onDrop(evt, page, item) {
Dashboard.showLoadingMsg();
var el = evt.item;
var newIndex = evt.newIndex;
var itemId = el.getAttribute('data-playlistitemid');
Dashboard.showLoadingMsg();
ApiClient.ajax({
url: ApiClient.getUrl('Playlists/' + item.Id + '/Items/' + itemId + '/Move/' + newIndex),

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'listView'], function (libraryBrowser, listView) {
define(['libraryBrowser', 'listView', 'emby-itemscontainer'], function (libraryBrowser, listView) {
return function (view, params) {

View file

@ -1803,6 +1803,7 @@ var AppInfo = {};
define("emby-collapse", [embyWebComponentsBowerPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
define("emby-button", [embyWebComponentsBowerPath + "/emby-button/emby-button"], returnFirstDependency);
define("emby-itemscontainer", [embyWebComponentsBowerPath + "/emby-itemscontainer/emby-itemscontainer"], returnFirstDependency);
define("alphaPicker", [embyWebComponentsBowerPath + "/alphapicker/alphapicker"], returnFirstDependency);
define("paper-icon-button-light", [embyWebComponentsBowerPath + "/emby-button/paper-icon-button-light"]);
@ -2021,6 +2022,9 @@ var AppInfo = {};
return {
isPlayingVideo: function () {
return false;
},
play: function (options) {
MediaController.play(options);
}
};
});
@ -2273,7 +2277,7 @@ var AppInfo = {};
var baseUrl = 'bower_components/emby-webcomponents/strings/';
var languages = ['da', 'de', 'en-US', 'es-MX', 'kk', 'nb', 'nl', 'pt-BR', 'pt-PT', 'ru', 'sv'];
var languages = ['da', 'de', 'en-US', 'es-MX', 'kk', 'nb', 'nl', 'pt-BR', 'pt-PT', 'ru', 'sv', 'zh-TW'];
var translations = languages.map(function (i) {
return {
@ -2566,7 +2570,7 @@ var AppInfo = {};
defineRoute({
path: '/itemdetails.html',
dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-icon-button-light', 'listViewStyle'],
dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-icon-button-light', 'emby-itemscontainer'],
controller: 'scripts/itemdetailpage',
autoFocus: false,
transition: 'fade'
@ -2836,7 +2840,7 @@ var AppInfo = {};
defineRoute({
path: '/nowplaying.html',
dependencies: ['paper-icon-button-light', 'emby-slider', 'emby-button', 'emby-input'],
dependencies: ['paper-icon-button-light', 'emby-slider', 'emby-button', 'emby-input', 'emby-itemscontainer'],
controller: 'scripts/nowplayingpage',
autoFocus: false,
transition: 'fade'

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'listView'], function (events, libraryBrowser, imageLoader, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, listView) {
return function (view, params, tabContent) {

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) {
return function (view, params, tabContent) {