diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js index e1aa1e00a8..ebf17def54 100644 --- a/src/controllers/livetv/livetvchannels.js +++ b/src/controllers/livetv/livetvchannels.js @@ -91,7 +91,7 @@ export default function (view, params, tabContent) { } function showFilterMenu(context) { - import(['components/filterdialog/filterdialog']).then(({default: FilterDialog}) => { + import('../../components/filterdialog/filterdialog').then(({default: FilterDialog}) => { const filterDialog = new FilterDialog({ query: getQuery(), mode: 'livetvchannels', diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js index d820715f5d..732b42bbf3 100644 --- a/src/controllers/livetv/livetvsuggested.js +++ b/src/controllers/livetv/livetvsuggested.js @@ -239,31 +239,31 @@ export default function (view, params) { // TODO int is a little hard to read switch (index) { case 0: - depends = 'controllers/livetv/livetvsuggested'; + depends = 'livetvsuggested'; break; case 1: - depends = 'controllers/livetv/livetvguide'; + depends = 'livetvguide'; break; case 2: - depends = 'controllers/livetv/livetvchannels'; + depends = 'livetvchannels'; break; case 3: - depends = 'controllers/livetv/livetvrecordings'; + depends = 'livetvrecordings'; break; case 4: - depends = 'controllers/livetv/livetvschedule'; + depends = 'livetvschedule'; break; case 5: - depends = 'controllers/livetv/livetvseriestimers'; + depends = 'livetvseriestimers'; break; } - import(depends).then(({default: controllerFactory}) => { + import(`../livetv/${depends}`).then(({default: controllerFactory}) => { let tabContent; if (index === 0) { diff --git a/src/controllers/livetvguideprovider.js b/src/controllers/livetvguideprovider.js index 33f3a51fce..65507e829f 100644 --- a/src/controllers/livetvguideprovider.js +++ b/src/controllers/livetvguideprovider.js @@ -7,9 +7,7 @@ function onListingsSubmitted() { } function init(page, type, providerId) { - const url = 'components/tvproviders/' + type + '.js'; - - import(url).then(({default: factory}) => { + import(`../components/tvproviders/${type}`).then(({default: factory}) => { const instance = new factory(page, providerId, {}); Events.on(instance, 'submitted', onListingsSubmitted); instance.init(); @@ -17,7 +15,7 @@ function init(page, type, providerId) { } function loadTemplate(page, type, providerId) { - import('./../components/tvproviders/' + type + '.template.html').then(({default: html}) => { + import(`../components/tvproviders/${type}.template.html`).then(({default: html}) => { page.querySelector('.providerTemplate').innerHTML = globalize.translateHtml(html); init(page, type, providerId); }); diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js index 2e11cffca4..18618345fe 100644 --- a/src/controllers/movies/moviesrecommended.js +++ b/src/controllers/movies/moviesrecommended.js @@ -282,31 +282,31 @@ import '../../elements/emby-button/emby-button'; switch (index) { case 0: - depends = 'controllers/movies/movies'; + depends = 'movies'; break; case 1: - depends = 'controllers/movies/moviesrecommended.js'; + depends = 'moviesrecommended.js'; break; case 2: - depends = 'controllers/movies/movietrailers'; + depends = 'movietrailers'; break; case 3: - depends = 'controllers/movies/movies'; + depends = 'movies'; break; case 4: - depends = 'controllers/movies/moviecollections'; + depends = 'moviecollections'; break; case 5: - depends = 'controllers/movies/moviegenres'; + depends = 'moviegenres'; break; } - import(depends).then(({default: controllerFactory}) => { + import(`../movies/${depends}`).then(({default: controllerFactory}) => { let tabContent; if (index === suggestionsTabIndex) { diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js index d0f7010417..107368ca7e 100644 --- a/src/controllers/music/musicrecommended.js +++ b/src/controllers/music/musicrecommended.js @@ -268,32 +268,32 @@ import '../../assets/css/flexstyles.css'; switch (index) { case 0: - depends = 'controllers/music/musicalbums'; + depends = 'musicalbums'; break; case 1: - depends = 'controllers/music/musicrecommended'; + depends = 'musicrecommended'; break; case 2: case 3: - depends = 'controllers/music/musicartists'; + depends = 'musicartists'; break; case 4: - depends = 'controllers/music/musicplaylists'; + depends = 'musicplaylists'; break; case 5: - depends = 'controllers/music/songs'; + depends = 'songs'; break; case 6: - depends = 'controllers/music/musicgenres'; + depends = 'musicgenres'; break; } - import(depends).then(({default: controllerFactory}) => { + import(`../music/${depends}`).then(({default: controllerFactory}) => { let tabContent; if (index == 1) { diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js index b77f2c7d5c..936aa587ee 100644 --- a/src/controllers/shows/tvrecommended.js +++ b/src/controllers/shows/tvrecommended.js @@ -247,31 +247,31 @@ import '../../elements/emby-button/emby-button'; switch (index) { case 0: - depends = 'controllers/shows/tvshows'; + depends = 'tvshows'; break; case 1: - depends = 'controllers/shows/tvrecommended'; + depends = 'tvrecommended'; break; case 2: - depends = 'controllers/shows/tvupcoming'; + depends = 'tvupcoming'; break; case 3: - depends = 'controllers/shows/tvgenres'; + depends = 'tvgenres'; break; case 4: - depends = 'controllers/shows/tvstudios'; + depends = 'tvstudios'; break; case 5: - depends = 'controllers/shows/episodes'; + depends = 'episodes'; break; } - import(depends).then(({default: controllerFactory}) => { + import(`../shows/${depends}`).then(({default: controllerFactory}) => { let tabContent; if (index === 1) {