From 7952ead55f58a9a5da9638a3f852872fcdbecb05 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 12 Jul 2020 15:25:49 +0100 Subject: [PATCH] migration of tvlatest to ES6 module --- package.json | 1 + src/controllers/shows/tvlatest.js | 35 ++++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index bd4ee75d86..1c2a35966c 100644 --- a/package.json +++ b/package.json @@ -139,6 +139,7 @@ "src/controllers/dashboard/plugins/repositories.js", "src/controllers/shows/episodes.js", "src/controllers/shows/tvgenres.js", + "src/controllers/shows/tvlatest.js", "src/plugins/bookPlayer/plugin.js", "src/plugins/bookPlayer/tableOfContents.js", "src/plugins/photoPlayer/plugin.js", diff --git a/src/controllers/shows/tvlatest.js b/src/controllers/shows/tvlatest.js index 08e420a595..c9860e17de 100644 --- a/src/controllers/shows/tvlatest.js +++ b/src/controllers/shows/tvlatest.js @@ -1,11 +1,16 @@ -define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLoader'], function (loading, groupedcards, cardBuilder, appHost, imageLoader) { - 'use strict'; +import loading from 'loading'; +import groupedcards from 'components/groupedcards'; +import cardBuilder from 'cardBuilder'; +import appHost from 'apphost'; +import imageLoader from 'imageLoader'; + +/* eslint-disable indent */ function getLatestPromise(context, params) { loading.show(); - var userId = ApiClient.getCurrentUserId(); - var parentId = params.topParentId; - var options = { + const userId = ApiClient.getCurrentUserId(); + const parentId = params.topParentId; + const options = { IncludeItemTypes: 'Episode', Limit: 30, Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', @@ -18,7 +23,7 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo function loadLatest(context, params, promise) { promise.then(function (items) { - var html = ''; + let html = ''; appHost.supports('imageanalysis'); html += cardBuilder.getCardsHtml({ items: items, @@ -36,20 +41,21 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo overlayPlayButton: true, lines: 2 }); - var elem = context.querySelector('#latestEpisodes'); + const elem = context.querySelector('#latestEpisodes'); elem.innerHTML = html; imageLoader.lazyChildren(elem); loading.hide(); - require(['autoFocuser'], function (autoFocuser) { + import('autoFocuser').then(({default: autoFocuser}) => { autoFocuser.autoFocus(context); }); }); } - return function (view, params, tabContent) { - var self = this; - var latestPromise; + export default function (view, params, tabContent) { + console.log(tabContent) + const self = this; + let latestPromise; self.preRender = function () { latestPromise = getLatestPromise(view, params); @@ -59,6 +65,7 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo loadLatest(tabContent, params, latestPromise); }; - tabContent.querySelector('#latestEpisodes').addEventListener('click', groupedcards.onItemsContainerClick); - }; -}); + tabContent.querySelector('#latestEpisodes').addEventListener('click', groupedcards); + } + +/* eslint-enable indent */