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

Migration of playlists to ES6 module

Browse source
This commit is contained in:
Cameron 2020-07-18 09:28:07 +01:00
parent fc96cbd9ad
commit 28bf9c3e6f
3 changed files with 183 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -166,6 +166,7 @@
"src/components/fetchhelper.js", "src/components/fetchhelper.js",
"src/scripts/editorsidebar.js", "src/scripts/editorsidebar.js",
"src/scripts/globalize.js", "src/scripts/globalize.js",
"src/scripts/playlists.js",
"src/scripts/keyboardNavigation.js", "src/scripts/keyboardNavigation.js",
"src/scripts/settings/appSettings.js", "src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js", "src/scripts/settings/userSettings.js",

4
src/scripts/editorsidebar.js
View file

@ -183,7 +183,7 @@ import 'material-icons';
} }
function initializeTree(page, currentUser, openItems, selectedId) { function initializeTree(page, currentUser, openItems, selectedId) {
require(['jstree'], function () { import('jstree').then(() => {
initializeTreeInternal(page, currentUser, openItems, selectedId); initializeTreeInternal(page, currentUser, openItems, selectedId);
}); });
} }
@ -303,7 +303,7 @@ import 'material-icons';
$(document).on('itemsaved', '.metadataEditorPage', function (e, item) { $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
updateEditorNode(this, item); updateEditorNode(this, item);
}).on('pagebeforeshow', '.metadataEditorPage', function () { }).on('pagebeforeshow', '.metadataEditorPage', function () {
require(['css!assets/css/metadataeditor.css']); import('css!assets/css/metadataeditor.css');
}).on('pagebeforeshow', '.metadataEditorPage', function () { }).on('pagebeforeshow', '.metadataEditorPage', function () {
var page = this; var page = this;
Dashboard.getCurrentUser().then(function (user) { Dashboard.getCurrentUser().then(function (user) {

53
src/scripts/playlists.js
View file

@ -1,10 +1,17 @@
define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', 'apphost', 'imageLoader', 'userSettings', 'emby-itemscontainer'], function (loading, listView, cardBuilder, libraryMenu, libraryBrowser, appHost, imageLoader, userSettings) { import loading from 'loading';
'use strict'; import listView from 'listView';
import cardBuilder from 'cardBuilder';
import libraryMenu from 'libraryMenu';
import libraryBrowser from 'libraryBrowser';
import appHost from 'apphost';
import imageLoader from 'imageLoader';
import userSettings from 'userSettings';
import 'emby-itemscontainer';
return function (view, params) { export default function (view, params) {
function getPageData(context) { function getPageData(context) {
var key = getSavedQueryKey(context); const key = getSavedQueryKey(context);
var pageData = data[key]; let pageData = data[key];
if (!pageData) { if (!pageData) {
pageData = data[key] = { pageData = data[key] = {
@ -51,8 +58,8 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
} }
function onViewStyleChange() { function onViewStyleChange() {
var viewStyle = getPageData(view).view; const viewStyle = getPageData(view).view;
var itemsContainer = view.querySelector('.itemsContainer'); const itemsContainer = view.querySelector('.itemsContainer');
if ('List' == viewStyle) { if ('List' == viewStyle) {
itemsContainer.classList.add('vertical-list'); itemsContainer.classList.add('vertical-list');
@ -67,16 +74,16 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
function reloadItems() { function reloadItems() {
showLoadingMessage(); showLoadingMessage();
var query = getQuery(view); const query = getQuery(view);
var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query); const promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
// TODO: promise2 is unused, check if necessary. // TODO: promise2 is unused, check if necessary.
var promise2 = Dashboard.getCurrentUser(); const promise2 = Dashboard.getCurrentUser();
Promise.all([promise1, promise2]).then(function (responses) { Promise.all([promise1, promise2]).then(function (responses) {
var result = responses[0]; const result = responses[0];
// TODO: Is the scroll necessary? // TODO: Is the scroll necessary?
window.scrollTo(0, 0); window.scrollTo(0, 0);
var html = ''; let html = '';
var viewStyle = getPageData(view).view; const viewStyle = getPageData(view).view;
view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({ view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
@ -135,10 +142,10 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
view.querySelector('.noItemsMessage').classList.remove('hide'); view.querySelector('.noItemsMessage').classList.remove('hide');
} }
var elem = view.querySelector('.itemsContainer'); const elem = view.querySelector('.itemsContainer');
elem.innerHTML = html; elem.innerHTML = html;
imageLoader.lazyChildren(elem); imageLoader.lazyChildren(elem);
var btnNextPage = view.querySelector('.btnNextPage'); const btnNextPage = view.querySelector('.btnNextPage');
if (btnNextPage) { if (btnNextPage) {
btnNextPage.addEventListener('click', function () { btnNextPage.addEventListener('click', function () {
@ -149,7 +156,7 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var btnPreviousPage = view.querySelector('.btnPreviousPage'); const btnPreviousPage = view.querySelector('.btnPreviousPage');
if (btnPreviousPage) { if (btnPreviousPage) {
btnPreviousPage.addEventListener('click', function () { btnPreviousPage.addEventListener('click', function () {
@ -160,11 +167,11 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var btnChangeLayout = view.querySelector('.btnChangeLayout'); const btnChangeLayout = view.querySelector('.btnChangeLayout');
if (btnChangeLayout) { if (btnChangeLayout) {
btnChangeLayout.addEventListener('layoutchange', function (e) { btnChangeLayout.addEventListener('layoutchange', function (e) {
var layout = e.detail.viewStyle; const layout = e.detail.viewStyle;
getPageData(view).view = layout; getPageData(view).view = layout;
libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout); libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout);
onViewStyleChange(); onViewStyleChange();
@ -177,13 +184,13 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
} }
var data = {}; const data = {};
view.addEventListener('viewbeforeshow', function () { view.addEventListener('viewbeforeshow', function () {
reloadItems(); reloadItems();
}); });
view.querySelector('.btnNewPlaylist').addEventListener('click', function () { view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
require(['playlistEditor'], function (playlistEditor) { import('playlistEditor').then(({default: playlistEditor}) => {
var serverId = ApiClient.serverInfo().Id; const serverId = ApiClient.serverInfo().Id;
new playlistEditor.showEditor({ new playlistEditor.showEditor({
items: [], items: [],
serverId: serverId serverId: serverId
@ -191,5 +198,5 @@ define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', '
}); });
}); });
onViewStyleChange(); onViewStyleChange();
}; }
});