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

Merge branch 'master' into fix-ci-maybe

Browse source
This commit is contained in:
dkanada 2020-11-21 22:10:40 +09:00 • committed by GitHub
commit 2c0b33b9a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
287 changed files with 6808 additions and 6318 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.ci/azure-pipelines-build.yml
View file

@ -8,8 +8,6 @@ jobs:
BuildConfiguration: development BuildConfiguration: development
Production: Production:
BuildConfiguration: production BuildConfiguration: production
Standalone:
BuildConfiguration: standalone
pool: pool:
vmImage: 'ubuntu-latest' vmImage: 'ubuntu-latest'
@ -39,10 +37,6 @@ jobs:
displayName: 'Build Production' displayName: 'Build Production'
condition: eq(variables['BuildConfiguration'], 'production') condition: eq(variables['BuildConfiguration'], 'production')
- script: 'yarn build:standalone'
displayName: 'Build Standalone'
condition: eq(variables['BuildConfiguration'], 'standalone')
- script: 'test -d dist' - script: 'test -d dist'
displayName: 'Check Build' displayName: 'Check Build'

7
.eslintrc.js
View file

@ -25,7 +25,6 @@ module.exports = {
'eslint:recommended', 'eslint:recommended',
// 'plugin:promise/recommended', // 'plugin:promise/recommended',
'plugin:import/errors', 'plugin:import/errors',
'plugin:import/warnings',
'plugin:eslint-comments/recommended', 'plugin:eslint-comments/recommended',
'plugin:compat/recommended' 'plugin:compat/recommended'
], ],
@ -79,16 +78,12 @@ module.exports = {
// Dependency globals // Dependency globals
'$': 'readonly', '$': 'readonly',
'jQuery': 'readonly', 'jQuery': 'readonly',
'requirejs': 'readonly',
// Jellyfin globals // Jellyfin globals
'ApiClient': 'writable', 'ApiClient': 'writable',
'AppInfo': 'writable',
'chrome': 'writable', 'chrome': 'writable',
'DlnaProfilePage': 'writable', 'DlnaProfilePage': 'writable',
'Dashboard': 'writable',
'DashboardPage': 'writable', 'DashboardPage': 'writable',
'Emby': 'readonly', 'Emby': 'readonly',
'Events': 'writable',
'getParameterByName': 'writable', 'getParameterByName': 'writable',
'getWindowLocationSearch': 'writable', 'getWindowLocationSearch': 'writable',
'Globalize': 'writable', 'Globalize': 'writable',
@ -98,8 +93,6 @@ module.exports = {
'LinkParser': 'writable', 'LinkParser': 'writable',
'LiveTvHelpers': 'writable', 'LiveTvHelpers': 'writable',
'MetadataEditor': 'writable', 'MetadataEditor': 'writable',
'pageClassOn': 'writable',
'pageIdOn': 'writable',
'PlaylistViewer': 'writable', 'PlaylistViewer': 'writable',
'UserParentalControlPage': 'writable', 'UserParentalControlPage': 'writable',
'Windows': 'readonly' 'Windows': 'readonly'

323
package.json
View file

@ -10,14 +10,13 @@
"@babel/eslint-plugin": "^7.12.1", "@babel/eslint-plugin": "^7.12.1",
"@babel/plugin-proposal-class-properties": "^7.10.1", "@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-private-methods": "^7.12.1", "@babel/plugin-proposal-private-methods": "^7.12.1",
"@babel/plugin-transform-modules-amd": "^7.12.1",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.12.1", "@babel/preset-env": "^7.12.1",
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"babel-loader": "^8.2.1", "babel-loader": "^8.2.1",
"browser-sync": "^2.26.13", "browser-sync": "^2.26.13",
"clean-webpack-plugin": "^3.0.0",
"confusing-browser-globals": "^1.0.10", "confusing-browser-globals": "^1.0.10",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^6.0.3",
"css-loader": "^5.0.1", "css-loader": "^5.0.1",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
"del": "^6.0.0", "del": "^6.0.0",
@ -26,6 +25,7 @@
"eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.2.1",
"expose-loader": "^1.0.1",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-babel": "^8.0.0", "gulp-babel": "^8.0.0",
@ -40,19 +40,24 @@
"gulp-sass": "^4.0.2", "gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^3.0.0", "gulp-sourcemaps": "^3.0.0",
"gulp-terser": "^1.4.1", "gulp-terser": "^1.4.1",
"html-loader": "^1.1.0",
"html-webpack-plugin": "^4.5.0", "html-webpack-plugin": "^4.5.0",
"lazypipe": "^1.0.2", "lazypipe": "^1.0.2",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"source-map-loader": "^1.1.1",
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"stylelint": "^13.7.2", "stylelint": "^13.7.2",
"stylelint-config-rational-order": "^0.1.2", "stylelint-config-rational-order": "^0.1.2",
"stylelint-no-browser-hacks": "^1.2.1", "stylelint-no-browser-hacks": "^1.2.1",
"stylelint-order": "^4.1.0", "stylelint-order": "^4.1.0",
"webpack": "^5.4.0", "webpack": "^5.4.0",
"webpack-cli": "^4.0.0",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2", "webpack-merge": "^4.2.2",
"webpack-stream": "^6.1.1", "webpack-stream": "^6.1.1",
"workbox-webpack-plugin": "^5.1.4",
"worker-plugin": "^5.0.0" "worker-plugin": "^5.0.0"
}, },
"dependencies": { "dependencies": {
@ -62,7 +67,6 @@
"core-js": "^3.7.0", "core-js": "^3.7.0",
"date-fns": "^2.16.1", "date-fns": "^2.16.1",
"epubjs": "^0.3.85", "epubjs": "^0.3.85",
"pdfjs-dist": "2.5.207",
"fast-text-encoding": "^1.0.3", "fast-text-encoding": "^1.0.3",
"flv.js": "^1.5.0", "flv.js": "^1.5.0",
"headroom.js": "^0.12.0", "headroom.js": "^0.12.0",
@ -70,6 +74,7 @@
"howler": "^2.2.1", "howler": "^2.2.1",
"intersection-observer": "^0.11.0", "intersection-observer": "^0.11.0",
"jellyfin-apiclient": "^1.4.2", "jellyfin-apiclient": "^1.4.2",
"jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"jstree": "^3.3.10", "jstree": "^3.3.10",
"libarchive.js": "^1.3.0", "libarchive.js": "^1.3.0",
@ -77,302 +82,31 @@
"material-design-icons-iconfont": "^6.1.0", "material-design-icons-iconfont": "^6.1.0",
"native-promise-only": "^0.8.0-a", "native-promise-only": "^0.8.0-a",
"page": "^1.11.6", "page": "^1.11.6",
"query-string": "^6.13.7", "pdfjs-dist": "2.5.207",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"sass": "^1.29.0",
"sass-loader": "^10.0.5",
"screenfull": "^5.0.2", "screenfull": "^5.0.2",
"sortablejs": "^1.12.0", "sortablejs": "^1.12.0",
"swiper": "^6.3.5", "swiper": "^6.3.5",
"webcomponents.js": "^0.7.24", "webcomponents.js": "^0.7.24",
"whatwg-fetch": "^3.5.0" "whatwg-fetch": "^3.5.0",
"workbox-core": "^5.1.4",
"workbox-precaching": "^5.1.4"
}, },
"babel": { "babel": {
"presets": [ "presets": [
"@babel/preset-env" [
"@babel/preset-env",
{
"useBuiltIns": "usage",
"corejs": 3
}
]
], ],
"overrides": [ "plugins": [
{ "@babel/plugin-proposal-class-properties",
"test": [ "@babel/plugin-proposal-private-methods"
"src/components/accessSchedule/accessSchedule.js",
"src/components/actionSheet/actionSheet.js",
"src/components/activitylog.js",
"src/components/alert.js",
"src/components/alphaPicker/alphaPicker.js",
"src/components/appFooter/appFooter.js",
"src/components/apphost.js",
"src/components/appRouter.js",
"src/components/autoFocuser.js",
"src/components/backdrop/backdrop.js",
"src/components/cardbuilder/cardBuilder.js",
"src/components/cardbuilder/chaptercardbuilder.js",
"src/components/cardbuilder/peoplecardbuilder.js",
"src/components/channelMapper/channelMapper.js",
"src/components/collectionEditor/collectionEditor.js",
"src/components/confirm/confirm.js",
"src/components/dialog/dialog.js",
"src/components/dialogHelper/dialogHelper.js",
"src/components/directorybrowser/directorybrowser.js",
"src/components/displaySettings/displaySettings.js",
"src/components/favoriteitems.js",
"src/components/fetchhelper.js",
"src/components/filterdialog/filterdialog.js",
"src/components/filtermenu/filtermenu.js",
"src/components/focusManager.js",
"src/components/groupedcards.js",
"src/components/guide/guide.js",
"src/components/guide/guide-settings.js",
"src/components/homeScreenSettings/homeScreenSettings.js",
"src/components/homesections/homesections.js",
"src/components/htmlMediaHelper.js",
"src/components/imageOptionsEditor/imageOptionsEditor.js",
"src/components/images/imageLoader.js",
"src/components/imageDownloader/imageDownloader.js",
"src/components/imageeditor/imageeditor.js",
"src/components/imageUploader/imageUploader.js",
"src/components/indicators/indicators.js",
"src/components/itemContextMenu.js",
"src/components/itemHelper.js",
"src/components/itemidentifier/itemidentifier.js",
"src/components/itemMediaInfo/itemMediaInfo.js",
"src/components/itemsrefresher.js",
"src/components/layoutManager.js",
"src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
"src/components/libraryoptionseditor/libraryoptionseditor.js",
"src/components/listview/listview.js",
"src/components/loading/loading.js",
"src/components/maintabsmanager.js",
"src/components/mediainfo/mediainfo.js",
"src/components/mediaLibraryCreator/mediaLibraryCreator.js",
"src/components/mediaLibraryEditor/mediaLibraryEditor.js",
"src/components/metadataEditor/metadataEditor.js",
"src/components/metadataEditor/personEditor.js",
"src/components/multiSelect/multiSelect.js",
"src/components/notifications/notifications.js",
"src/components/nowPlayingBar/nowPlayingBar.js",
"src/components/packageManager.js",
"src/components/playback/brightnessosd.js",
"src/components/playback/mediasession.js",
"src/components/playback/nowplayinghelper.js",
"src/components/playback/playbackorientation.js",
"src/components/playback/playbackmanager.js",
"src/components/playback/playerSelectionMenu.js",
"src/components/playback/playersettingsmenu.js",
"src/components/playback/playmethodhelper.js",
"src/components/playback/playqueuemanager.js",
"src/components/playback/remotecontrolautoplay.js",
"src/components/playback/volumeosd.js",
"src/components/playbackSettings/playbackSettings.js",
"src/components/playerstats/playerstats.js",
"src/components/playlisteditor/playlisteditor.js",
"src/components/playmenu.js",
"src/components/pluginManager.js",
"src/components/prompt/prompt.js",
"src/components/qualityOptions.js",
"src/components/quickConnectSettings/quickConnectSettings.js",
"src/components/recordingcreator/recordingbutton.js",
"src/components/recordingcreator/recordingcreator.js",
"src/components/recordingcreator/seriesrecordingeditor.js",
"src/components/recordingcreator/recordinghelper.js",
"src/components/refreshdialog/refreshdialog.js",
"src/components/recordingcreator/recordingeditor.js",
"src/components/recordingcreator/recordingfields.js",
"src/components/remotecontrol/remotecontrol.js",
"src/components/sanatizefilename.js",
"src/components/scrollManager.js",
"src/plugins/experimentalWarnings/plugin.js",
"src/plugins/sessionPlayer/plugin.js",
"src/plugins/htmlAudioPlayer/plugin.js",
"src/plugins/comicsPlayer/plugin.js",
"src/plugins/chromecastPlayer/plugin.js",
"src/components/slideshow/slideshow.js",
"src/components/sortmenu/sortmenu.js",
"src/plugins/htmlVideoPlayer/plugin.js",
"src/plugins/logoScreensaver/plugin.js",
"src/plugins/playAccessValidation/plugin.js",
"src/components/search/searchfields.js",
"src/components/search/searchresults.js",
"src/components/settingshelper.js",
"src/components/shortcuts.js",
"src/components/subtitleeditor/subtitleeditor.js",
"src/components/subtitlesync/subtitlesync.js",
"src/components/subtitlesettings/subtitleappearancehelper.js",
"src/components/subtitlesettings/subtitlesettings.js",
"src/components/syncPlay/groupSelectionMenu.js",
"src/components/syncPlay/playbackPermissionManager.js",
"src/components/syncPlay/syncPlayManager.js",
"src/components/syncPlay/timeSyncManager.js",
"src/components/themeMediaPlayer.js",
"src/components/tabbedview/tabbedview.js",
"src/components/viewManager/viewManager.js",
"src/components/tvproviders/schedulesdirect.js",
"src/components/tvproviders/xmltv.js",
"src/components/toast/toast.js",
"src/components/tunerPicker.js",
"src/components/upnextdialog/upnextdialog.js",
"src/components/userdatabuttons/userdatabuttons.js",
"src/components/viewContainer.js",
"src/components/viewSettings/viewSettings.js",
"src/components/castSenderApi.js",
"src/controllers/session/addServer/index.js",
"src/controllers/session/forgotPassword/index.js",
"src/controllers/session/resetPassword/index.js",
"src/controllers/session/login/index.js",
"src/controllers/session/selectServer/index.js",
"src/controllers/dashboard/apikeys.js",
"src/controllers/dashboard/dashboard.js",
"src/controllers/dashboard/devices/device.js",
"src/controllers/dashboard/devices/devices.js",
"src/controllers/dashboard/dlna/profile.js",
"src/controllers/dashboard/dlna/profiles.js",
"src/controllers/dashboard/dlna/settings.js",
"src/controllers/dashboard/encodingsettings.js",
"src/controllers/dashboard/general.js",
"src/controllers/dashboard/librarydisplay.js",
"src/controllers/dashboard/logs.js",
"src/controllers/music/musicalbums.js",
"src/controllers/music/musicartists.js",
"src/controllers/music/musicgenres.js",
"src/controllers/music/musicplaylists.js",
"src/controllers/music/musicrecommended.js",
"src/controllers/music/songs.js",
"src/controllers/dashboard/library.js",
"src/controllers/dashboard/metadataImages.js",
"src/controllers/dashboard/metadatanfo.js",
"src/controllers/dashboard/networking.js",
"src/controllers/dashboard/notifications/notification/index.js",
"src/controllers/dashboard/notifications/notifications/index.js",
"src/controllers/dashboard/playback.js",
"src/controllers/dashboard/plugins/add/index.js",
"src/controllers/dashboard/plugins/installed/index.js",
"src/controllers/dashboard/plugins/available/index.js",
"src/controllers/dashboard/plugins/repositories/index.js",
"src/controllers/dashboard/quickConnect.js",
"src/controllers/dashboard/scheduledtasks/scheduledtask.js",
"src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
"src/controllers/dashboard/serveractivity.js",
"src/controllers/dashboard/streaming.js",
"src/controllers/dashboard/users/useredit.js",
"src/controllers/dashboard/users/userlibraryaccess.js",
"src/controllers/dashboard/users/usernew.js",
"src/controllers/dashboard/users/userparentalcontrol.js",
"src/controllers/dashboard/users/userpasswordpage.js",
"src/controllers/dashboard/users/userprofilespage.js",
"src/controllers/home.js",
"src/controllers/list.js",
"src/controllers/edititemmetadata.js",
"src/controllers/favorites.js",
"src/controllers/hometab.js",
"src/controllers/movies/moviecollections.js",
"src/controllers/movies/moviegenres.js",
"src/controllers/movies/movies.js",
"src/controllers/movies/moviesrecommended.js",
"src/controllers/movies/movietrailers.js",
"src/controllers/playback/nowplaying.js",
"src/controllers/playback/videoosd.js",
"src/controllers/itemDetails/index.js",
"src/controllers/playback/queue/index.js",
"src/controllers/playback/video/index.js",
"src/controllers/searchpage.js",
"src/controllers/livetv/livetvguide.js",
"src/controllers/livetvtuner.js",
"src/controllers/livetv/livetvsuggested.js",
"src/controllers/livetvstatus.js",
"src/controllers/livetvguideprovider.js",
"src/controllers/livetvsettings.js",
"src/controllers/livetv/livetvrecordings.js",
"src/controllers/livetv/livetvschedule.js",
"src/controllers/livetv/livetvseriestimers.js",
"src/controllers/livetv/livetvchannels.js",
"src/controllers/shows/episodes.js",
"src/controllers/shows/tvgenres.js",
"src/controllers/shows/tvlatest.js",
"src/controllers/shows/tvrecommended.js",
"src/controllers/shows/tvshows.js",
"src/controllers/shows/tvstudios.js",
"src/controllers/shows/tvupcoming.js",
"src/controllers/user/display/index.js",
"src/controllers/user/home/index.js",
"src/controllers/user/menu/index.js",
"src/controllers/user/playback/index.js",
"src/controllers/user/profile/index.js",
"src/controllers/user/quickConnect/index.js",
"src/controllers/user/subtitles/index.js",
"src/controllers/wizard/finish/index.js",
"src/controllers/wizard/remote/index.js",
"src/controllers/wizard/settings/index.js",
"src/controllers/wizard/start/index.js",
"src/controllers/wizard/user/index.js",
"src/elements/emby-button/emby-button.js",
"src/elements/emby-button/paper-icon-button-light.js",
"src/elements/emby-checkbox/emby-checkbox.js",
"src/elements/emby-collapse/emby-collapse.js",
"src/elements/emby-input/emby-input.js",
"src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js",
"src/elements/emby-itemscontainer/emby-itemscontainer.js",
"src/elements/emby-playstatebutton/emby-playstatebutton.js",
"src/elements/emby-programcell/emby-programcell.js",
"src/elements/emby-progressbar/emby-progressbar.js",
"src/elements/emby-progressring/emby-progressring.js",
"src/elements/emby-radio/emby-radio.js",
"src/elements/emby-ratingbutton/emby-ratingbutton.js",
"src/elements/emby-scrollbuttons/emby-scrollbuttons.js",
"src/elements/emby-scroller/emby-scroller.js",
"src/elements/emby-select/emby-select.js",
"src/elements/emby-slider/emby-slider.js",
"src/elements/emby-tabs/emby-tabs.js",
"src/elements/emby-textarea/emby-textarea.js",
"src/elements/emby-toggle/emby-toggle.js",
"src/libraries/screensavermanager.js",
"src/libraries/navdrawer/navdrawer.js",
"src/libraries/scroller.js",
"src/plugins/backdropScreensaver/plugin.js",
"src/plugins/bookPlayer/plugin.js",
"src/plugins/pdfPlayer/plugin.js",
"src/plugins/bookPlayer/tableOfContents.js",
"src/plugins/chromecastPlayer/chromecastHelper.js",
"src/plugins/photoPlayer/plugin.js",
"src/plugins/youtubePlayer/plugin.js",
"src/scripts/alphanumericshortcuts.js",
"src/scripts/autoBackdrops.js",
"src/scripts/autocast.js",
"src/scripts/browser.js",
"src/scripts/clientUtils.js",
"src/scripts/datetime.js",
"src/scripts/deleteHelper.js",
"src/scripts/dfnshelper.js",
"src/scripts/dom.js",
"src/scripts/editorsidebar.js",
"src/scripts/fileDownloader.js",
"src/scripts/filesystem.js",
"src/scripts/globalize.js",
"src/scripts/imagehelper.js",
"src/scripts/itembynamedetailpage.js",
"src/scripts/inputManager.js",
"src/scripts/autoThemes.js",
"src/scripts/themeManager.js",
"src/scripts/keyboardNavigation.js",
"src/scripts/libraryMenu.js",
"src/scripts/libraryBrowser.js",
"src/scripts/livetvcomponents.js",
"src/scripts/mouseManager.js",
"src/scripts/multiDownload.js",
"src/scripts/playlists.js",
"src/scripts/scrollHelper.js",
"src/scripts/serverNotifications.js",
"src/scripts/routes.js",
"src/scripts/settings/appSettings.js",
"src/scripts/settings/userSettings.js",
"src/scripts/settings/webSettings.js",
"src/scripts/shell.js",
"src/scripts/taskbutton.js",
"src/scripts/themeLoader.js",
"src/scripts/touchHelper.js"
],
"plugins": [
"@babel/plugin-transform-modules-amd",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-private-methods"
]
}
] ]
}, },
"browserslist": [ "browserslist": [
@ -393,11 +127,10 @@
], ],
"scripts": { "scripts": {
"start": "yarn serve", "start": "yarn serve",
"serve": "gulp serve --development", "serve": "webpack serve --config webpack.dev.js",
"prepare": "./scripts/prepare.sh", "prepare": "./scripts/prepare.sh",
"build:development": "gulp --development", "build:development": "webpack --config webpack.dev.js",
"build:production": "gulp --production", "build:production": "webpack --config webpack.prod.js",
"build:standalone": "gulp standalone --development",
"lint": "eslint \".\"", "lint": "eslint \".\"",
"stylelint": "stylelint \"src/**/*.css\"" "stylelint": "stylelint \"src/**/*.css\""
} }

182
src/bundle.js
View file

@ -1,182 +0,0 @@
/**
* require.js module definitions bundled by webpack
*/
// Use define from require.js not webpack's define
const _define = window.define;
// fetch
const fetch = require('whatwg-fetch');
_define('fetch', function() {
return fetch;
});
// Blurhash
const blurhash = require('blurhash');
_define('blurhash', function() {
return blurhash;
});
// query-string
const query = require('query-string');
_define('queryString', function() {
return query;
});
// flvjs
const flvjs = require('flv.js/dist/flv').default;
_define('flvjs', function() {
return flvjs;
});
// jstree
const jstree = require('jstree');
require('jstree/dist/themes/default/style.css');
_define('jstree', function() {
return jstree;
});
// jquery
const jquery = require('jquery');
_define('jQuery', function() {
return jquery;
});
// hlsjs
const hlsjs = require('hls.js');
_define('hlsjs', function() {
return hlsjs;
});
// howler
const howler = require('howler');
_define('howler', function() {
return howler;
});
// resize-observer-polyfill
const resize = require('resize-observer-polyfill').default;
_define('resize-observer-polyfill', function() {
return resize;
});
// swiper
const swiper = require('swiper/swiper-bundle');
require('swiper/swiper-bundle.css');
_define('swiper', function() {
return swiper;
});
// sortable
const sortable = require('sortablejs').default;
_define('sortable', function() {
return sortable;
});
// webcomponents
const webcomponents = require('webcomponents.js/webcomponents-lite');
_define('webcomponents', function() {
return webcomponents;
});
// libass-wasm
const libassWasm = require('libass-wasm');
_define('JavascriptSubtitlesOctopus', function() {
return libassWasm;
});
// material-icons
const materialIcons = require('material-design-icons-iconfont/dist/material-design-icons.css');
_define('material-icons', function() {
return materialIcons;
});
const epubjs = require('epubjs');
_define('epubjs', function () {
return epubjs;
});
const pdfjs = require('pdfjs-dist/build/pdf');
_define('pdfjs', function () {
return pdfjs;
});
// page.js
const page = require('page');
_define('page', function() {
return page;
});
// core-js
const polyfill = require('@babel/polyfill/dist/polyfill');
_define('polyfill', function () {
return polyfill;
});
// domtokenlist-shim
const classlist = require('classlist.js');
_define('classlist-polyfill', function () {
return classlist;
});
// Date-FNS
const dateFns = require('date-fns');
_define('date-fns', function () {
return dateFns;
});
const dateFnsLocale = require('date-fns/locale');
_define('date-fns/locale', function () {
return dateFnsLocale;
});
const fast_text_encoding = require('fast-text-encoding');
_define('fast-text-encoding', function () {
return fast_text_encoding;
});
// intersection-observer
const intersection_observer = require('intersection-observer');
_define('intersection-observer', function () {
return intersection_observer;
});
// screenfull
const screenfull = require('screenfull');
_define('screenfull', function () {
return screenfull;
});
// headroom.js
const headroom = require('headroom.js/dist/headroom');
_define('headroom', function () {
return headroom;
});
// apiclient
const apiclient = require('jellyfin-apiclient');
_define('apiclient', function () {
return apiclient.ApiClient;
});
_define('events', function () {
return apiclient.Events;
});
_define('credentialprovider', function () {
return apiclient.Credentials;
});
_define('connectionManagerFactory', function () {
return apiclient.ConnectionManager;
});
_define('appStorage', function () {
return apiclient.AppStorage;
});
// libarchive.js
const libarchive = require('libarchive.js');
_define('libarchive', function () {
return libarchive;
});

4
src/components/AppInfo.js Normal file
View file

@ -0,0 +1,4 @@
export default {
isNativeApp: false
};

82
src/components/ServerConnections.js Normal file
View file

@ -0,0 +1,82 @@
import { ConnectionManager, Credentials, ApiClient, Events } from 'jellyfin-apiclient';
import { appHost } from './apphost';
import Dashboard from '../scripts/clientUtils';
import AppInfo from './AppInfo';
import { setUserInfo } from '../scripts/settings/userSettings';
class ServerConnections extends ConnectionManager {
constructor() {
super(...arguments);
this.localApiClient = null;
Events.on(this, 'localusersignedout', function () {
setUserInfo(null, null);
});
}
initApiClient() {
if (!AppInfo.isNativeApp) {
console.debug('creating ApiClient singleton');
const apiClient = new ApiClient(
Dashboard.serverAddress(),
appHost.appName(),
appHost.appVersion(),
appHost.deviceName(),
appHost.deviceId()
);
apiClient.enableAutomaticNetworking = false;
apiClient.manualAddressOnly = true;
this.addApiClient(apiClient);
this.setLocalApiClient(apiClient);
console.debug('loaded ApiClient singleton');
}
}
setLocalApiClient(apiClient) {
if (apiClient) {
this.localApiClient = apiClient;
window.ApiClient = apiClient;
}
}
getLocalApiClient() {
return this.localApiClient;
}
currentApiClient() {
let apiClient = this.getLocalApiClient();
if (!apiClient) {
const server = this.getLastUsedServer();
if (server) {
apiClient = this.getApiClient(server.Id);
}
}
return apiClient;
}
onLocalUserSignedIn(user) {
const apiClient = this.getApiClient(user.ServerId);
this.setLocalApiClient(apiClient);
return setUserInfo(user.Id, apiClient);
}
}
const credentials = new Credentials();
const capabilities = Dashboard.capabilities(appHost);
export default new ServerConnections(
credentials,
appHost.appName(),
appHost.appVersion(),
appHost.deviceName(),
appHost.deviceId(),
capabilities);

15
src/components/accessSchedule/accessSchedule.js
View file

@ -1,3 +1,4 @@
/* eslint-disable indent */ /* eslint-disable indent */
/** /**
@ -5,12 +6,12 @@
* @module components/accessSchedule/accessSchedule * @module components/accessSchedule/accessSchedule
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'formDialogStyle'; import '../formdialog.css';
function getDisplayTime(hours) { function getDisplayTime(hours) {
let minutes = 0; let minutes = 0;
@ -59,7 +60,7 @@ import 'formDialogStyle';
export function show(options) { export function show(options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
import('text!./accessSchedule.template.html').then(({default: template}) => { import('./accessSchedule.template.html').then(({default: template}) => {
const dlg = dialogHelper.createDialog({ const dlg = dialogHelper.createDialog({
removeOnClose: true, removeOnClose: true,
size: 'small' size: 'small'

20
src/components/actionSheet/actionSheet.js
View file

@ -1,12 +1,12 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'css!./actionSheet'; import './actionSheet.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'scrollStyles'; import '../../assets/css/scrollstyles.css';
import 'listViewStyle'; import '../../components/listview/listview.css';
function getOffsets(elems) { function getOffsets(elems) {
const results = []; const results = [];
@ -71,7 +71,7 @@ function getPosition(options, dlg) {
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });

30
src/components/activitylog.js
View file

@ -1,11 +1,13 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import dom from 'dom'; import dom from '../scripts/dom';
import * as datefns from 'date-fns'; import * as datefns from 'date-fns';
import dfnshelper from 'dfnshelper'; import dfnshelper from '../scripts/dfnshelper';
import serverNotifications from 'serverNotifications'; import serverNotifications from '../scripts/serverNotifications';
import 'emby-button'; import '../elements/emby-button/emby-button';
import 'listViewStyle'; import './listview/listview.css';
import ServerConnections from './ServerConnections';
import alert from './alert';
/* eslint-disable indent */ /* eslint-disable indent */
@ -127,10 +129,8 @@ import 'listViewStyle';
} }
function showItemOverview(item) { function showItemOverview(item) {
import('alert').then(({default: alert}) => { alert({
alert({ text: item.Overview
text: item.Overview
});
}); });
} }
@ -140,11 +140,11 @@ class ActivityLog {
const element = options.element; const element = options.element;
element.classList.add('activityLogListWidget'); element.classList.add('activityLogListWidget');
element.addEventListener('click', onListClick.bind(this)); element.addEventListener('click', onListClick.bind(this));
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
reloadData(this, element, apiClient); reloadData(this, element, apiClient);
const onUpdate = onActivityLogUpdate.bind(this); const onUpdate = onActivityLogUpdate.bind(this);
this.updateFn = onUpdate; this.updateFn = onUpdate;
events.on(serverNotifications, 'ActivityLogEntry', onUpdate); Events.on(serverNotifications, 'ActivityLogEntry', onUpdate);
apiClient.sendMessage('ActivityLogEntryStart', '0,1500'); apiClient.sendMessage('ActivityLogEntryStart', '0,1500');
} }
destroy() { destroy() {
@ -152,13 +152,13 @@ class ActivityLog {
if (options) { if (options) {
options.element.classList.remove('activityLogListWidget'); options.element.classList.remove('activityLogListWidget');
window.connectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500'); ServerConnections.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500');
} }
const onUpdate = this.updateFn; const onUpdate = this.updateFn;
if (onUpdate) { if (onUpdate) {
events.off(serverNotifications, 'ActivityLogEntry', onUpdate); Events.off(serverNotifications, 'ActivityLogEntry', onUpdate);
} }
this.items = null; this.items = null;

7
src/components/alert.js
View file

@ -1,6 +1,7 @@
import browser from 'browser';
import dialog from 'dialog'; import browser from '../scripts/browser';
import globalize from 'globalize'; import dialog from './dialog/dialog';
import globalize from '../scripts/globalize';
/* eslint-disable indent */ /* eslint-disable indent */

12
src/components/alphaPicker/alphaPicker.js
View file

@ -5,12 +5,12 @@
* @module components/alphaPicker/alphaPicker * @module components/alphaPicker/alphaPicker
*/ */
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'css!./style.css'; import './style.css';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'material-icons'; import 'material-design-icons-iconfont';
const selectedButtonClass = 'alphaPickerButton-selected'; const selectedButtonClass = 'alphaPickerButton-selected';

4
src/components/appFooter/appFooter.js
View file

@ -1,4 +1,4 @@
import 'css!./appFooter'; import './appFooter.css';
function render(options) { function render(options) {
const elem = document.createElement('div'); const elem = document.createElement('div');
@ -33,4 +33,4 @@ class appFooter {
} }
} }
export default appFooter; export default new appFooter({});

94
src/components/appRouter.js
View file

@ -1,13 +1,17 @@
import appHost from 'apphost'; import { appHost } from './apphost';
import appSettings from 'appSettings'; import appSettings from '../scripts/settings/appSettings';
import backdrop from 'backdrop'; import backdrop from './backdrop/backdrop';
import browser from 'browser'; import browser from '../scripts/browser';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import itemHelper from 'itemHelper'; import itemHelper from './itemHelper';
import loading from 'loading'; import loading from './loading/loading';
import page from 'page'; import page from 'page';
import viewManager from 'viewManager'; import viewManager from './viewManager/viewManager';
import AppInfo from './AppInfo';
import Dashboard from '../scripts/clientUtils';
import ServerConnections from './ServerConnections';
import alert from './alert';
class AppRouter { class AppRouter {
allRoutes = []; allRoutes = [];
@ -94,7 +98,7 @@ class AppRouter {
beginConnectionWizard() { beginConnectionWizard() {
backdrop.clearBackdrop(); backdrop.clearBackdrop();
loading.show(); loading.show();
window.connectionManager.connect({ ServerConnections.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => { }).then((result) => {
this.handleConnectionResult(result); this.handleConnectionResult(result);
@ -150,10 +154,10 @@ class AppRouter {
loading.show(); loading.show();
this.initApiClients(); this.initApiClients();
events.on(appHost, 'beforeexit', this.onBeforeExit); Events.on(appHost, 'beforeexit', this.onBeforeExit);
events.on(appHost, 'resume', this.onAppResume); Events.on(appHost, 'resume', this.onAppResume);
window.connectionManager.connect({ ServerConnections.connect({
enableAutoLogin: appSettings.enableAutoLogin() enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => { }).then((result) => {
this.firstConnectionResult = result; this.firstConnectionResult = result;
@ -209,7 +213,7 @@ class AppRouter {
showItem(item, serverId, options) { showItem(item, serverId, options) {
// TODO: Refactor this so it only gets items, not strings. // TODO: Refactor this so it only gets items, not strings.
if (typeof (item) === 'string') { if (typeof (item) === 'string') {
const apiClient = serverId ? window.connectionManager.getApiClient(serverId) : window.connectionManager.currentApiClient(); const apiClient = serverId ? ServerConnections.getApiClient(serverId) : ServerConnections.currentApiClient();
apiClient.getItem(apiClient.getCurrentUserId(), item).then((itemObject) => { apiClient.getItem(apiClient.getCurrentUserId(), item).then((itemObject) => {
this.showItem(itemObject, options); this.showItem(itemObject, options);
}); });
@ -268,7 +272,7 @@ class AppRouter {
switch (result.State) { switch (result.State) {
case 'SignedIn': case 'SignedIn':
loading.hide(); loading.hide();
Emby.Page.goHome(); this.goHome();
break; break;
case 'ServerSignIn': case 'ServerSignIn':
result.ApiClient.getPublicUsers().then((users) => { result.ApiClient.getPublicUsers().then((users) => {
@ -286,13 +290,11 @@ class AppRouter {
this.showWelcome(); this.showWelcome();
break; break;
case 'ServerUpdateNeeded': case 'ServerUpdateNeeded':
import('alert').then(({default: alert}) =>{ alert({
alert({ text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'),
text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'), html: globalize.translate('ServerUpdateNeeded', '<a href="https://github.com/jellyfin/jellyfin">https://github.com/jellyfin/jellyfin</a>')
html: globalize.translate('ServerUpdateNeeded', '<a href="https://github.com/jellyfin/jellyfin">https://github.com/jellyfin/jellyfin</a>') }).then(() => {
}).then(() => { this.showSelectServer();
this.showSelectServer();
});
}); });
break; break;
default: default:
@ -308,22 +310,20 @@ class AppRouter {
url = route.contentPath || route.path; url = route.contentPath || route.path;
} }
if (url.includes('configurationpage')) {
url = ApiClient.getUrl('/web' + url);
} else if (url.indexOf('://') === -1) {
// Put a slash at the beginning but make sure to avoid a double slash
if (url.indexOf('/') !== 0) {
url = '/' + url;
}
url = this.baseUrl() + url;
}
if (ctx.querystring && route.enableContentQueryString) { if (ctx.querystring && route.enableContentQueryString) {
url += '?' + ctx.querystring; url += '?' + ctx.querystring;
} }
import('text!' + url).then(({default: html}) => { let promise;
if (route.serverRequest) {
const apiClient = ServerConnections.currentApiClient();
url = apiClient.getUrl(`/web${url}`);
promise = apiClient.get(url);
} else {
promise = import(/* webpackChunkName: "[request]" */ `../controllers/${url}`);
}
promise.then((html) => {
this.loadContent(ctx, route, html, request); this.loadContent(ctx, route, html, request);
}); });
} }
@ -340,7 +340,7 @@ class AppRouter {
}; };
if (route.controller) { if (route.controller) {
import('controllers/' + route.controller).then(onInitComplete); import('../controllers/' + route.controller).then(onInitComplete);
} else { } else {
onInitComplete(); onInitComplete();
} }
@ -407,9 +407,7 @@ class AppRouter {
this.forcedLogoutMsg = null; this.forcedLogoutMsg = null;
if (msg) { if (msg) {
import('alert').then((alert) => { alert(msg);
alert(msg);
});
} }
} }
@ -484,8 +482,8 @@ class AppRouter {
newApiClient.getMaxBandwidth = this.getMaxBandwidth; newApiClient.getMaxBandwidth = this.getMaxBandwidth;
} }
events.off(newApiClient, 'requestfail', this.onRequestFail); Events.off(newApiClient, 'requestfail', this.onRequestFail);
events.on(newApiClient, 'requestfail', this.onRequestFail); Events.on(newApiClient, 'requestfail', this.onRequestFail);
} }
initApiClient(apiClient, instance) { initApiClient(apiClient, instance) {
@ -493,15 +491,15 @@ class AppRouter {
} }
initApiClients() { initApiClients() {
window.connectionManager.getApiClients().forEach((apiClient) => { ServerConnections.getApiClients().forEach((apiClient) => {
this.initApiClient(apiClient, this); this.initApiClient(apiClient, this);
}); });
events.on(window.connectionManager, 'apiclientcreated', this.onApiClientCreated); Events.on(ServerConnections, 'apiclientcreated', this.onApiClientCreated);
} }
onAppResume() { onAppResume() {
const apiClient = window.connectionManager.currentApiClient(); const apiClient = ServerConnections.currentApiClient();
if (apiClient) { if (apiClient) {
apiClient.ensureWebSocket(); apiClient.ensureWebSocket();
@ -519,7 +517,7 @@ class AppRouter {
} }
} }
const apiClient = window.connectionManager.currentApiClient(); const apiClient = ServerConnections.currentApiClient();
const pathname = ctx.pathname.toLowerCase(); const pathname = ctx.pathname.toLowerCase();
console.debug('appRouter - processing path request ' + pathname); console.debug('appRouter - processing path request ' + pathname);
@ -546,7 +544,7 @@ class AppRouter {
if (route.isDefaultRoute) { if (route.isDefaultRoute) {
console.debug('appRouter - loading skin home page'); console.debug('appRouter - loading skin home page');
Emby.Page.goHome(); this.goHome();
return; return;
} else if (route.roles) { } else if (route.roles) {
this.validateRoles(apiClient, route.roles).then(() => { this.validateRoles(apiClient, route.roles).then(() => {
@ -846,4 +844,8 @@ class AppRouter {
} }
} }
export default new AppRouter(); export const appRouter = new AppRouter();
window.Emby = window.Emby || {};
window.Emby.Page = appRouter;

140
src/components/apphost.js
View file

@ -1,9 +1,11 @@
import appSettings from 'appSettings';
import browser from 'browser'; import appSettings from '../scripts/settings/appSettings';
import events from 'events'; import browser from '../scripts/browser';
import * as htmlMediaHelper from 'htmlMediaHelper'; import { Events } from 'jellyfin-apiclient';
import * as webSettings from 'webSettings'; import * as htmlMediaHelper from '../components/htmlMediaHelper';
import globalize from 'globalize'; import * as webSettings from '../scripts/settings/webSettings';
import globalize from '../scripts/globalize';
import profileBuilder from '../scripts/browserDeviceProfile';
function getBaseProfileOptions(item) { function getBaseProfileOptions(item) {
const disableHlsVideoAudioCodecs = []; const disableHlsVideoAudioCodecs = [];
@ -26,19 +28,16 @@ function getBaseProfileOptions(item) {
function getDeviceProfile(item, options = {}) { function getDeviceProfile(item, options = {}) {
return new Promise(function (resolve) { return new Promise(function (resolve) {
import('browserdeviceprofile').then(({default: profileBuilder}) => { let profile;
let profile;
if (window.NativeShell) { if (window.NativeShell) {
profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder); profile = window.NativeShell.AppHost.getDeviceProfile(profileBuilder);
} else { } else {
const builderOpts = getBaseProfileOptions(item); const builderOpts = getBaseProfileOptions(item);
builderOpts.enableSsaRender = (item && !options.isRetry && appSettings.get('subtitleburnin') !== 'allcomplexformats'); profile = profileBuilder(builderOpts);
profile = profileBuilder(builderOpts); }
}
resolve(profile); resolve(profile);
});
}); });
} }
@ -57,60 +56,62 @@ function generateDeviceId() {
if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), window.btoa) { if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), window.btoa) {
const result = replaceAll(btoa(keys.join('|')), '=', '1'); const result = replaceAll(btoa(keys.join('|')), '=', '1');
return Promise.resolve(result); return result;
} }
return Promise.resolve(new Date().getTime()); return new Date().getTime();
} }
function getDeviceId() { function getDeviceId() {
const key = '_deviceId2'; if (!deviceId) {
const deviceId = appSettings.get(key); const key = '_deviceId2';
if (deviceId) { deviceId = appSettings.get(key);
return Promise.resolve(deviceId);
if (!deviceId) {
deviceId = generateDeviceId();
appSettings.set(key, deviceId);
}
} }
return generateDeviceId().then(function (deviceId) { return deviceId;
appSettings.set(key, deviceId);
return deviceId;
});
} }
function getDeviceName() { function getDeviceName() {
let deviceName; if (!deviceName) {
if (browser.tizen) { if (browser.tizen) {
deviceName = 'Samsung Smart TV'; deviceName = 'Samsung Smart TV';
} else if (browser.web0s) { } else if (browser.web0s) {
deviceName = 'LG Smart TV'; deviceName = 'LG Smart TV';
} else if (browser.operaTv) { } else if (browser.operaTv) {
deviceName = 'Opera TV'; deviceName = 'Opera TV';
} else if (browser.xboxOne) { } else if (browser.xboxOne) {
deviceName = 'Xbox One'; deviceName = 'Xbox One';
} else if (browser.ps4) { } else if (browser.ps4) {
deviceName = 'Sony PS4'; deviceName = 'Sony PS4';
} else if (browser.chrome) { } else if (browser.chrome) {
deviceName = 'Chrome'; deviceName = 'Chrome';
} else if (browser.edgeChromium) { } else if (browser.edgeChromium) {
deviceName = 'Edge Chromium'; deviceName = 'Edge Chromium';
} else if (browser.edge) { } else if (browser.edge) {
deviceName = 'Edge'; deviceName = 'Edge';
} else if (browser.firefox) { } else if (browser.firefox) {
deviceName = 'Firefox'; deviceName = 'Firefox';
} else if (browser.opera) { } else if (browser.opera) {
deviceName = 'Opera'; deviceName = 'Opera';
} else if (browser.safari) { } else if (browser.safari) {
deviceName = 'Safari'; deviceName = 'Safari';
} else { } else {
deviceName = 'Web Browser'; deviceName = 'Web Browser';
} }
if (browser.ipad) { if (browser.ipad) {
deviceName += ' iPad'; deviceName += ' iPad';
} else if (browser.iphone) { } else if (browser.iphone) {
deviceName += ' iPhone'; deviceName += ' iPhone';
} else if (browser.android) { } else if (browser.android) {
deviceName += ' Android'; deviceName += ' Android';
}
} }
return deviceName; return deviceName;
@ -172,7 +173,7 @@ function supportsCue() {
function onAppVisible() { function onAppVisible() {
if (isHidden) { if (isHidden) {
isHidden = false; isHidden = false;
events.trigger(appHost, 'resume'); Events.trigger(appHost, 'resume');
} }
} }
@ -296,7 +297,7 @@ function askForExit() {
return; return;
} }
import('actionsheet').then(({default: actionsheet}) => { import('../components/actionSheet/actionSheet').then((actionsheet) => {
exitPromise = actionsheet.show({ exitPromise = actionsheet.show({
title: globalize.translate('MessageConfirmAppExit'), title: globalize.translate('MessageConfirmAppExit'),
items: [ items: [
@ -318,7 +319,7 @@ let deviceName;
const appName = 'Jellyfin Web'; const appName = 'Jellyfin Web';
const appVersion = '10.7.0'; const appVersion = '10.7.0';
const appHost = { export const appHost = {
getWindowState: function () { getWindowState: function () {
return document.windowState || 'Normal'; return document.windowState || 'Normal';
}, },
@ -353,16 +354,16 @@ const appHost = {
return window.NativeShell.AppHost.init(); return window.NativeShell.AppHost.init();
} }
deviceName = getDeviceName(); return {
getDeviceId().then(function (id) { deviceId: getDeviceId(),
deviceId = id; deviceName: getDeviceName()
}); };
}, },
deviceName: function () { deviceName: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceName() : deviceName; return window.NativeShell ? window.NativeShell.AppHost.deviceName() : getDeviceName();
}, },
deviceId: function () { deviceId: function () {
return window.NativeShell ? window.NativeShell.AppHost.deviceId() : deviceId; return window.NativeShell ? window.NativeShell.AppHost.deviceId() : getDeviceId();
}, },
appName: function () { appName: function () {
return window.NativeShell ? window.NativeShell.AppHost.appName() : appName; return window.NativeShell ? window.NativeShell.AppHost.appName() : appName;
@ -407,4 +408,5 @@ if (window.addEventListener) {
window.addEventListener('blur', onAppHidden); window.addEventListener('blur', onAppHidden);
} }
export default appHost; // load app host on module load
appHost.init();

4
src/components/autoFocuser.js
View file

@ -5,8 +5,8 @@
* @module components/autoFocuser * @module components/autoFocuser
*/ */
import focusManager from 'focusManager'; import focusManager from './focusManager';
import layoutManager from 'layoutManager'; import layoutManager from './layoutManager';
/** /**
* Previously selected element. * Previously selected element.

13
src/components/backdrop/backdrop.js
View file

@ -1,8 +1,9 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import dom from 'dom'; import dom from '../../scripts/dom';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import 'css!./backdrop'; import './backdrop.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -176,7 +177,7 @@ import 'css!./backdrop';
function getItemImageUrls(item, imageOptions) { function getItemImageUrls(item, imageOptions) {
imageOptions = imageOptions || {}; imageOptions = imageOptions || {};
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
if (item.BackdropImageTags && item.BackdropImageTags.length > 0) { if (item.BackdropImageTags && item.BackdropImageTags.length > 0) {
return item.BackdropImageTags.map((imgTag, index) => { return item.BackdropImageTags.map((imgTag, index) => {
return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, { return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {

39
src/components/cardbuilder/cardBuilder.js
View file

@ -5,21 +5,22 @@
* @module components/cardBuilder/cardBuilder * @module components/cardBuilder/cardBuilder
*/ */
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import itemHelper from 'itemHelper'; import itemHelper from '../itemHelper';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import indicators from 'indicators'; import indicators from '../indicators/indicators';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import dom from 'dom'; import dom from '../../scripts/dom';
import browser from 'browser'; import browser from '../../scripts/browser';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import itemShortcuts from 'itemShortcuts'; import itemShortcuts from '../shortcuts';
import imageHelper from 'scripts/imagehelper'; import imageHelper from '../../scripts/imagehelper';
import 'css!./card'; import './card.css';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'programStyles'; import '../guide/programs.css';
import ServerConnections from '../ServerConnections';
const enableFocusTransform = !browser.slow && !browser.edge; const enableFocusTransform = !browser.slow && !browser.edge;
@ -370,7 +371,7 @@ import 'programStyles';
if (serverId !== lastServerId) { if (serverId !== lastServerId) {
lastServerId = serverId; lastServerId = serverId;
apiClient = window.connectionManager.getApiClient(lastServerId); apiClient = ServerConnections.getApiClient(lastServerId);
} }
if (options.indexBy) { if (options.indexBy) {
@ -1121,7 +1122,7 @@ import 'programStyles';
if (!refreshIndicatorLoaded) { if (!refreshIndicatorLoaded) {
refreshIndicatorLoaded = true; refreshIndicatorLoaded = true;
/* eslint-disable-next-line @babel/no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-itemrefreshindicator'); import('../../elements/emby-itemrefreshindicator/emby-itemrefreshindicator');
} }
} }
@ -1453,7 +1454,7 @@ import 'programStyles';
if (itemHelper.canMarkPlayed(item)) { if (itemHelper.canMarkPlayed(item)) {
/* eslint-disable-next-line @babel/no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-playstatebutton'); import('../../elements/emby-playstatebutton/emby-playstatebutton');
html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>'; html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
} }
@ -1461,7 +1462,7 @@ import 'programStyles';
const likes = userData.Likes == null ? '' : userData.Likes; const likes = userData.Likes == null ? '' : userData.Likes;
/* eslint-disable-next-line @babel/no-unused-expressions */ /* eslint-disable-next-line @babel/no-unused-expressions */
import('emby-ratingbutton'); import('../../elements/emby-ratingbutton/emby-ratingbutton');
html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>'; html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
} }

11
src/components/cardbuilder/chaptercardbuilder.js
View file

@ -5,10 +5,11 @@
* @module components/cardBuilder/chaptercardbuilder * @module components/cardBuilder/chaptercardbuilder
*/ */
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import browser from 'browser'; import browser from '../../scripts/browser';
import ServerConnections from '../ServerConnections';
const enableFocusTransform = !browser.slow && !browser.edge; const enableFocusTransform = !browser.slow && !browser.edge;
@ -47,7 +48,7 @@ import browser from 'browser';
let html = ''; let html = '';
let itemsInRow = 0; let itemsInRow = 0;
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
for (let i = 0, length = chapters.length; i < length; i++) { for (let i = 0, length = chapters.length; i < length; i++) {
if (options.rows && itemsInRow === 0) { if (options.rows && itemsInRow === 0) {

2
src/components/cardbuilder/peoplecardbuilder.js
View file

@ -5,7 +5,7 @@
* @module components/cardBuilder/peoplecardbuilder * @module components/cardBuilder/peoplecardbuilder
*/ */
import cardBuilder from 'cardBuilder'; import cardBuilder from './cardBuilder';
export function buildPeopleCards(items, options) { export function buildPeopleCards(items, options) {
options = Object.assign(options || {}, { options = Object.assign(options || {}, {

27
src/components/channelMapper/channelMapper.js
View file

@ -1,21 +1,22 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import actionsheet from 'actionsheet'; import actionsheet from '../actionSheet/actionSheet';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'listViewStyle'; import '../listview/listview.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'formDialogStyle'; import '../formdialog.css';
import ServerConnections from '../ServerConnections';
export default class channelMapper { export default class channelMapper {
constructor(options) { constructor(options) {
function mapChannel(button, channelId, providerChannelId) { function mapChannel(button, channelId, providerChannelId) {
loading.show(); loading.show();
const providerId = options.providerId; const providerId = options.providerId;
window.connectionManager.getApiClient(options.serverId).ajax({ ServerConnections.getApiClient(options.serverId).ajax({
type: 'POST', type: 'POST',
url: ApiClient.getUrl('LiveTv/ChannelMappings'), url: ApiClient.getUrl('LiveTv/ChannelMappings'),
data: JSON.stringify({ data: JSON.stringify({
@ -58,7 +59,7 @@ export default class channelMapper {
} }
function getChannelMappingOptions(serverId, providerId) { function getChannelMappingOptions(serverId, providerId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', { return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', {
providerId: providerId providerId: providerId
})); }));

40
src/components/collectionEditor/collectionEditor.js
View file

@ -1,17 +1,19 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-checkbox'; import '../../elements/emby-button/emby-button';
import 'emby-input'; import '../../elements/emby-button/paper-icon-button-light';
import 'paper-icon-button-light'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-select'; import '../../elements/emby-input/emby-input';
import 'material-icons'; import '../../elements/emby-select/emby-select';
import 'css!./../formdialog'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../formdialog.css';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/* eslint-disable indent */ /* eslint-disable indent */
@ -24,7 +26,7 @@ import 'flexStyles';
const collectionId = panel.querySelector('#selectCollectionToAddTo').value; const collectionId = panel.querySelector('#selectCollectionToAddTo').value;
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
if (collectionId) { if (collectionId) {
addToCollection(apiClient, panel, collectionId); addToCollection(apiClient, panel, collectionId);
@ -80,9 +82,7 @@ import 'flexStyles';
dlg.submitted = true; dlg.submitted = true;
dialogHelper.close(dlg); dialogHelper.close(dlg);
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageItemsAdded'));
toast(globalize.translate('MessageItemsAdded'));
});
}); });
} }
@ -105,7 +105,7 @@ import 'flexStyles';
EnableTotalRecordCount: false EnableTotalRecordCount: false
}; };
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => { apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = ''; let html = '';
@ -199,7 +199,7 @@ import 'flexStyles';
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then((scrollHelper) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });

118
src/components/confirm/confirm.js
View file

@ -1,69 +1,65 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import dialog from 'dialog'; import dialog from '../dialog/dialog';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
/* eslint-disable indent */ function replaceAll(str, find, replace) {
export default (() => { return str.split(find).join(replace);
function replaceAll(str, find, replace) { }
return str.split(find).join(replace);
function nativeConfirm(options) {
if (typeof options === 'string') {
options = {
title: '',
text: options
};
} }
if (browser.tv && window.confirm) { const text = replaceAll(options.text || '', '<br/>', '\n');
// Use the native confirm dialog const result = window.confirm(text);
return options => {
if (typeof options === 'string') {
options = {
title: '',
text: options
};
}
const text = replaceAll(options.text || '', '<br/>', '\n'); if (result) {
const result = window.confirm(text); return Promise.resolve();
} else {
return Promise.reject();
}
}
if (result) { function customConfirm(text, title) {
return Promise.resolve(); let options;
} else { if (typeof text === 'string') {
return Promise.reject(); options = {
} title: title,
text: text
}; };
} else { } else {
// Use our own dialog options = text;
return (text, title) => {
let options;
if (typeof text === 'string') {
options = {
title: title,
text: text
};
} else {
options = text;
}
const items = [];
items.push({
name: options.cancelText || globalize.translate('ButtonCancel'),
id: 'cancel',
type: 'cancel'
});
items.push({
name: options.confirmText || globalize.translate('ButtonOk'),
id: 'ok',
type: options.primary === 'delete' ? 'delete' : 'submit'
});
options.buttons = items;
return dialog.show(options).then(result => {
if (result === 'ok') {
return Promise.resolve();
}
return Promise.reject();
});
};
} }
})();
/* eslint-enable indent */ const items = [];
items.push({
name: options.cancelText || globalize.translate('ButtonCancel'),
id: 'cancel',
type: 'cancel'
});
items.push({
name: options.confirmText || globalize.translate('ButtonOk'),
id: 'ok',
type: options.primary === 'delete' ? 'delete' : 'submit'
});
options.buttons = items;
return dialog.show(options).then(result => {
if (result === 'ok') {
return Promise.resolve();
}
return Promise.reject();
});
}
const confirm = browser.tv && window.confirm ? nativeConfirm : customConfirm;
export default confirm;

24
src/components/dialog/dialog.js
View file

@ -1,14 +1,14 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'formDialogStyle'; import '../formdialog.css';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
/* eslint-disable indent */ /* eslint-disable indent */
@ -128,7 +128,7 @@ import 'flexStyles';
options = text; options = text;
} }
const { default: template } = await import('text!./dialog.template.html'); const { default: template } = await import('./dialog.template.html');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
showDialog(options, template).then(resolve, reject); showDialog(options, template).then(resolve, reject);
}); });

18
src/components/dialogHelper/dialogHelper.js
View file

@ -1,11 +1,11 @@
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import browser from 'browser'; import browser from '../../scripts/browser';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import inputManager from 'inputManager'; import inputManager from '../../scripts/inputManager';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'css!./dialoghelper.css'; import './dialoghelper.css';
import 'scrollStyles'; import '../../assets/css/scrollstyles.css';
/* eslint-disable indent */ /* eslint-disable indent */
@ -354,7 +354,7 @@ import 'scrollStyles';
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then((scrollHelper) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });

25
src/components/directorybrowser/directorybrowser.js
View file

@ -1,13 +1,14 @@
import loading from 'loading'; import loading from '../loading/loading';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'listViewStyle'; import '../listview/listview.css';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./directorybrowser'; import './directorybrowser.css';
import 'formDialogStyle'; import '../formdialog.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import alert from '../alert';
/* eslint-disable indent */ /* eslint-disable indent */
@ -157,9 +158,7 @@ import 'emby-button';
} }
function alertTextWithOptions(options) { function alertTextWithOptions(options) {
import('alert').then(({default: alert}) => { alert(options);
alert(options);
});
} }
function validatePath(path, validateWriteable, apiClient) { function validatePath(path, validateWriteable, apiClient) {

40
src/components/displaySettings/displaySettings.js
View file

@ -1,16 +1,18 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import pluginManager from 'pluginManager'; import { pluginManager } from '../pluginManager';
import appHost from 'apphost'; import { appHost } from '../apphost';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import loading from '../loading/loading';
import skinManager from 'skinManager'; import skinManager from '../../scripts/themeManager';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/* eslint-disable indent */ /* eslint-disable indent */
@ -168,11 +170,9 @@ import 'emby-button';
saveUser(context, user, userSettings, apiClient).then(() => { saveUser(context, user, userSettings, apiClient).then(() => {
loading.hide(); loading.hide();
if (enableSaveConfirmation) { if (enableSaveConfirmation) {
import('toast').then(({default: toast}) => { toast(globalize.translate('SettingsSaved'));
toast(globalize.translate('SettingsSaved'));
});
} }
events.trigger(instance, 'saved'); Events.trigger(instance, 'saved');
}, () => { }, () => {
loading.hide(); loading.hide();
}); });
@ -181,7 +181,7 @@ import 'emby-button';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -198,7 +198,7 @@ import 'emby-button';
} }
async function embed(options, self) { async function embed(options, self) {
const { default: template } = await import('text!./displaySettings.template.html'); const { default: template } = await import('./displaySettings.template.html');
options.element.innerHTML = globalize.translateHtml(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self)); options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
if (options.enableSaveButton) { if (options.enableSaveButton) {
@ -220,7 +220,7 @@ import 'emby-button';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
return apiClient.getUser(userId).then(user => { return apiClient.getUser(userId).then(user => {

18
src/components/favoriteitems.js
View file

@ -1,12 +1,12 @@
import loading from 'loading'; import loading from './loading/loading';
import cardBuilder from 'cardBuilder'; import cardBuilder from './cardbuilder/cardBuilder';
import dom from 'dom'; import dom from '../scripts/dom';
import appHost from 'apphost'; import { appHost } from './apphost';
import imageLoader from 'imageLoader'; import imageLoader from './images/imageLoader';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import layoutManager from 'layoutManager'; import layoutManager from './layoutManager';
import 'scrollStyles'; import '../assets/css/scrollstyles.css';
import 'emby-itemscontainer'; import '../elements/emby-itemscontainer/emby-itemscontainer';
/* eslint-disable indent */ /* eslint-disable indent */

21
src/components/filterdialog/filterdialog.js
View file

@ -1,10 +1,11 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-collapse'; import '../../elements/emby-collapse/emby-collapse';
import 'css!./style.css'; import './style.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
function renderOptions(context, selector, cssClass, items, isCheckedFn) { function renderOptions(context, selector, cssClass, items, isCheckedFn) {
@ -108,7 +109,7 @@ import 'css!./style.css';
* @param instance {FilterDialog} An instance of FilterDialog * @param instance {FilterDialog} An instance of FilterDialog
*/ */
function triggerChange(instance) { function triggerChange(instance) {
events.trigger(instance, 'filterchange'); Events.trigger(instance, 'filterchange');
} }
function setVisibility(context, options) { function setVisibility(context, options) {
@ -401,7 +402,7 @@ import 'css!./style.css';
} }
show() { show() {
return import('text!./filterdialog.template.html').then(({default: template}) => { return import('./filterdialog.template.html').then(({default: template}) => {
return new Promise((resolve) => { return new Promise((resolve) => {
const dlg = dialogHelper.createDialog({ const dlg = dialogHelper.createDialog({
removeOnClose: true, removeOnClose: true,
@ -419,7 +420,7 @@ import 'css!./style.css';
this.bindEvents(dlg); this.bindEvents(dlg);
if (enableDynamicFilters(this.options.mode)) { if (enableDynamicFilters(this.options.mode)) {
dlg.classList.add('dynamicFilterDialog'); dlg.classList.add('dynamicFilterDialog');
const apiClient = window.connectionManager.getApiClient(this.options.serverId); const apiClient = ServerConnections.getApiClient(this.options.serverId);
loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query); loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query);
} }
}); });

37
src/components/filtermenu/filtermenu.js
View file

@ -1,18 +1,19 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import inputManager from 'inputManager'; import inputManager from '../../scripts/inputManager';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'paper-icon-button-light'; import '../../elements/emby-button/emby-button';
import 'emby-select'; import '../../elements/emby-button/paper-icon-button-light';
import 'material-icons'; import '../../elements/emby-select/emby-select';
import 'css!./../formdialog'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../formdialog.css';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
function onSubmit(e) { function onSubmit(e) {
e.preventDefault(); e.preventDefault();
@ -80,7 +81,7 @@ function moveCheckboxFocus(elem, offset) {
} }
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({ default: scrollHelper }) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -193,7 +194,7 @@ function initEditor(context, settings) {
} }
} }
function loadDynamicFilters(context, options) { function loadDynamicFilters(context, options) {
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
const filterMenuOptions = Object.assign(options.filterMenuOptions, { const filterMenuOptions = Object.assign(options.filterMenuOptions, {
@ -209,7 +210,7 @@ function loadDynamicFilters(context, options) {
class FilterMenu { class FilterMenu {
show(options) { show(options) {
return new Promise( (resolve, reject) => { return new Promise( (resolve, reject) => {
import('text!./filtermenu.template.html').then(({ default: template }) => { import('./filtermenu.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

4
src/components/focusManager.js
View file

@ -1,7 +1,7 @@
/* eslint-disable indent */ /* eslint-disable indent */
import dom from 'dom'; import dom from '../scripts/dom';
import scrollManager from 'scrollManager'; import scrollManager from './scrollManager';
const scopes = []; const scopes = [];
function pushScope(elem) { function pushScope(elem) {

8
src/components/groupedcards.js
View file

@ -1,12 +1,14 @@
/* eslint-disable indent */ /* eslint-disable indent */
import dom from 'dom'; import dom from '../scripts/dom';
import appRouter from 'appRouter'; import { appRouter } from './appRouter';
import Dashboard from '../scripts/clientUtils';
import ServerConnections from './ServerConnections';
function onGroupedCardClick(e, card) { function onGroupedCardClick(e, card) {
const itemId = card.getAttribute('data-id'); const itemId = card.getAttribute('data-id');
const serverId = card.getAttribute('data-serverid'); const serverId = card.getAttribute('data-serverid');
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const userId = apiClient.getCurrentUserId(); const userId = apiClient.getCurrentUserId();
const playedIndicator = card.querySelector('.playedIndicator'); const playedIndicator = card.querySelector('.playedIndicator');
const playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null; const playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null;

20
src/components/guide/guide-settings.js
View file

@ -1,12 +1,12 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-radio'; import '../../elements/emby-radio/emby-radio';
import 'css!./../formdialog'; import '../formdialog.css';
import 'material-icons'; import 'material-design-icons-iconfont';
function saveCategories(context, options) { function saveCategories(context, options) {
const categories = []; const categories = [];
@ -88,7 +88,7 @@ function showEditor(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
let settingsChanged = false; let settingsChanged = false;
import('text!./guide-settings.template.html').then(({ default: template }) => { import('./guide-settings.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

81
src/components/guide/guide.js
View file

@ -1,32 +1,33 @@
import inputManager from 'inputManager'; import inputManager from '../../scripts/inputManager';
import browser from 'browser'; import browser from '../../scripts/browser';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import scrollHelper from 'scrollHelper'; import { Events } from 'jellyfin-apiclient';
import serverNotifications from 'serverNotifications'; import scrollHelper from '../../scripts/scrollHelper';
import loading from 'loading'; import serverNotifications from '../../scripts/serverNotifications';
import datetime from 'datetime'; import loading from '../loading/loading';
import focusManager from 'focusManager'; import datetime from '../../scripts/datetime';
import playbackManager from 'playbackManager'; import focusManager from '../focusManager';
import * as userSettings from 'userSettings'; import { playbackManager } from '../playback/playbackmanager';
import imageLoader from 'imageLoader'; import * as userSettings from '../../scripts/settings/userSettings';
import events from 'events'; import imageLoader from '../images/imageLoader';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import itemShortcuts from 'itemShortcuts'; import itemShortcuts from '../shortcuts';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'css!./guide.css'; import './guide.css';
import 'programStyles'; import './programs.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'scrollStyles'; import '../../assets/css/scrollstyles.css';
import 'emby-programcell'; import '../../elements/emby-programcell/emby-programcell';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-tabs'; import '../../elements/emby-tabs/emby-tabs';
import 'emby-scroller'; import '../../elements/emby-scroller/emby-scroller';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import 'webcomponents'; import 'webcomponents.js/webcomponents-lite';
import ServerConnections from '../ServerConnections';
function showViewSettings(instance) { function showViewSettings(instance) {
import('guide-settings-dialog').then(({default: guideSettingsDialog}) => { import('./guide-settings').then(({default: guideSettingsDialog}) => {
guideSettingsDialog.show(instance.categoryOptions).then(function () { guideSettingsDialog.show(instance.categoryOptions).then(function () {
instance.refresh(); instance.refresh();
}); });
@ -164,10 +165,10 @@ function Guide(options) {
self.destroy = function () { self.destroy = function () {
stopAutoRefresh(); stopAutoRefresh();
events.off(serverNotifications, 'TimerCreated', onTimerCreated); Events.off(serverNotifications, 'TimerCreated', onTimerCreated);
events.off(serverNotifications, 'SeriesTimerCreated', onSeriesTimerCreated); Events.off(serverNotifications, 'SeriesTimerCreated', onSeriesTimerCreated);
events.off(serverNotifications, 'TimerCancelled', onTimerCancelled); Events.off(serverNotifications, 'TimerCancelled', onTimerCancelled);
events.off(serverNotifications, 'SeriesTimerCancelled', onSeriesTimerCancelled); Events.off(serverNotifications, 'SeriesTimerCancelled', onSeriesTimerCancelled);
setScrollEvents(options.element, false); setScrollEvents(options.element, false);
itemShortcuts.off(options.element); itemShortcuts.off(options.element);
@ -212,7 +213,7 @@ function Guide(options) {
} }
function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) { function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
const channelQuery = { const channelQuery = {
@ -872,7 +873,7 @@ function Guide(options) {
function reloadPage(page) { function reloadPage(page) {
showLoading(); showLoading();
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
apiClient.getLiveTvGuideInfo().then(function (guideInfo) { apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
setDateRange(page, guideInfo); setDateRange(page, guideInfo);
@ -1001,7 +1002,7 @@ function Guide(options) {
const item = items[id]; const item = items[id];
if (item) { if (item) {
events.trigger(self, 'focus', [ Events.trigger(self, 'focus', [
{ {
item: item item: item
}]); }]);
@ -1091,7 +1092,7 @@ function Guide(options) {
} }
} }
import('text!./tvguide.template.html').then(({default: template}) => { import('./tvguide.template.html').then(({default: template}) => {
const context = options.element; const context = options.element;
context.classList.add('tvguide'); context.classList.add('tvguide');
@ -1183,12 +1184,12 @@ function Guide(options) {
setScrollEvents(context, true); setScrollEvents(context, true);
itemShortcuts.on(context); itemShortcuts.on(context);
events.trigger(self, 'load'); Events.trigger(self, 'load');
events.on(serverNotifications, 'TimerCreated', onTimerCreated); Events.on(serverNotifications, 'TimerCreated', onTimerCreated);
events.on(serverNotifications, 'SeriesTimerCreated', onSeriesTimerCreated); Events.on(serverNotifications, 'SeriesTimerCreated', onSeriesTimerCreated);
events.on(serverNotifications, 'TimerCancelled', onTimerCancelled); Events.on(serverNotifications, 'TimerCancelled', onTimerCancelled);
events.on(serverNotifications, 'SeriesTimerCancelled', onSeriesTimerCancelled); Events.on(serverNotifications, 'SeriesTimerCancelled', onSeriesTimerCancelled);
self.refresh(); self.refresh();
}); });

35
src/components/homeScreenSettings/homeScreenSettings.js
View file

@ -1,13 +1,16 @@
import layoutManager from 'layoutManager';
import focusManager from 'focusManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import focusManager from '../focusManager';
import loading from 'loading'; import globalize from '../../scripts/globalize';
import homeSections from 'homeSections'; import loading from '../loading/loading';
import dom from 'dom'; import { Events } from 'jellyfin-apiclient';
import events from 'events'; import homeSections from '../homesections/homesections';
import 'listViewStyle'; import dom from '../../scripts/dom';
import 'emby-select'; import '../listview/listview.css';
import 'emby-checkbox'; import '../../elements/emby-select/emby-select';
import '../../elements/emby-checkbox/emby-checkbox';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/* eslint-disable indent */ /* eslint-disable indent */
@ -369,12 +372,10 @@ import 'emby-checkbox';
saveUser(context, user, userSettings, apiClient).then(() => { saveUser(context, user, userSettings, apiClient).then(() => {
loading.hide(); loading.hide();
if (enableSaveConfirmation) { if (enableSaveConfirmation) {
import('toast').then(({default: toast}) => { toast(globalize.translate('SettingsSaved'));
toast(globalize.translate('SettingsSaved'));
});
} }
events.trigger(instance, 'saved'); Events.trigger(instance, 'saved');
}, () => { }, () => {
loading.hide(); loading.hide();
}); });
@ -383,7 +384,7 @@ import 'emby-checkbox';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -417,7 +418,7 @@ import 'emby-checkbox';
} }
function embed(options, self) { function embed(options, self) {
return import('text!./homeScreenSettings.template.html').then(({default: template}) => { return import('./homeScreenSettings.template.html').then(({default: template}) => {
for (let i = 1; i <= numConfigurableSections; i++) { for (let i = 1; i <= numConfigurableSections; i++) {
template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i)); template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i));
} }
@ -455,7 +456,7 @@ import 'emby-checkbox';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => { apiClient.getUser(userId).then(user => {

38
src/components/homesections/homesections.js
View file

@ -1,15 +1,17 @@
import cardBuilder from 'cardBuilder'; import cardBuilder from '../cardbuilder/cardBuilder';
import dom from 'dom'; import dom from '../../scripts/dom';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import imageHelper from 'scripts/imagehelper'; import imageHelper from '../../scripts/imagehelper';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-itemscontainer'; import '../../elements/emby-itemscontainer/emby-itemscontainer';
import 'emby-scroller'; import '../../elements/emby-scroller/emby-scroller';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'css!./homesections'; import './homesections.css';
import Dashboard from '../../scripts/clientUtils';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -211,7 +213,7 @@ import 'css!./homesections';
function getFetchLatestItemsFn(serverId, parentId, collectionType) { function getFetchLatestItemsFn(serverId, parentId, collectionType) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
let limit = 16; let limit = 16;
if (enableScrollX()) { if (enableScrollX()) {
@ -367,7 +369,7 @@ import 'css!./homesections';
function getContinueWatchingFetchFn(serverId) { function getContinueWatchingFetchFn(serverId) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
let limit; let limit;
@ -440,7 +442,7 @@ import 'css!./homesections';
function getContinueListeningFetchFn(serverId) { function getContinueListeningFetchFn(serverId) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth; const screenWidth = dom.getWindowSize().innerWidth;
let limit; let limit;
@ -513,7 +515,7 @@ import 'css!./homesections';
function getOnNowFetchFn(serverId) { function getOnNowFetchFn(serverId) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getLiveTvRecommendedPrograms({ return apiClient.getLiveTvRecommendedPrograms({
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
IsAiring: true, IsAiring: true,
@ -656,7 +658,7 @@ import 'css!./homesections';
function getNextUpFetchFn(serverId) { function getNextUpFetchFn(serverId) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getNextUpEpisodes({ return apiClient.getNextUpEpisodes({
Limit: enableScrollX() ? 24 : 15, Limit: enableScrollX() ? 24 : 15,
Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path', Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path',
@ -727,7 +729,7 @@ import 'css!./homesections';
function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) { function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) {
return function () { return function () {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getLiveTvRecordings({ return apiClient.getLiveTvRecordings({
userId: apiClient.getCurrentUserId(), userId: apiClient.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 5, Limit: enableScrollX() ? 12 : 5,

11
src/components/htmlMediaHelper.js
View file

@ -1,8 +1,9 @@
/* eslint-disable indent */ /* eslint-disable indent */
import appSettings from 'appSettings' ; import appSettings from '../scripts/settings/appSettings' ;
import browser from 'browser'; import browser from '../scripts/browser';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
export function getSavedVolume() { export function getSavedVolume() {
return appSettings.get('volume') || 1; return appSettings.get('volume') || 1;
@ -114,7 +115,7 @@ import events from 'events';
instance.destroyCustomTrack(instance._mediaElement); instance.destroyCustomTrack(instance._mediaElement);
} }
events.trigger(instance, 'error', [ Events.trigger(instance, 'error', [
{ {
type: type type: type
} }
@ -359,7 +360,7 @@ import events from 'events';
src: instance._currentSrc src: instance._currentSrc
}; };
events.trigger(instance, 'stopped', [stopInfo]); Events.trigger(instance, 'stopped', [stopInfo]);
instance._currentTime = null; instance._currentTime = null;
instance._currentSrc = null; instance._currentSrc = null;

33
src/components/imageDownloader/imageDownloader.js
View file

@ -1,17 +1,18 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import loading from 'loading'; import loading from '../loading/loading';
import appHost from 'apphost'; import { appHost } from '../apphost';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import browser from 'browser'; import browser from '../../scripts/browser';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'formDialogStyle'; import '../formdialog.css';
import 'cardStyle'; import '../cardbuilder/card.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -315,8 +316,8 @@ import 'cardStyle';
function showEditor(itemId, serverId, itemType) { function showEditor(itemId, serverId, itemType) {
loading.show(); loading.show();
import('text!./imageDownloader.template.html').then(({default: template}) => { import('./imageDownloader.template.html').then(({default: template}) => {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
currentItemId = itemId; currentItemId = itemId;
currentItemType = itemType; currentItemType = itemType;

12
src/components/imageOptionsEditor/imageOptionsEditor.js
View file

@ -5,12 +5,12 @@
* @module components/imageOptionsEditor/imageOptionsEditor * @module components/imageOptionsEditor/imageOptionsEditor
*/ */
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'emby-input'; import '../../elements/emby-input/emby-input';
function getDefaultImageConfig(itemType, type) { function getDefaultImageConfig(itemType, type) {
return { return {

42
src/components/imageUploader/imageUploader.js
View file

@ -5,16 +5,18 @@
* @module components/imageUploader/imageUploader * @module components/imageUploader/imageUploader
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import loading from 'loading'; import loading from '../loading/loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'formDialogStyle'; import '../formdialog.css';
import 'css!./style'; import './style.css';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
let currentItemId; let currentItemId;
let currentServerId; let currentServerId;
@ -26,16 +28,12 @@ import 'css!./style';
switch (evt.target.error.code) { switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR: case evt.target.error.NOT_FOUND_ERR:
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageFileReadError'));
toast(globalize.translate('MessageFileReadError'));
});
break; break;
case evt.target.error.ABORT_ERR: case evt.target.error.ABORT_ERR:
break; // noop break; // noop
default: default:
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageFileReadError'));
toast(globalize.translate('MessageFileReadError'));
});
break; break;
} }
} }
@ -87,9 +85,7 @@ import 'css!./style';
} }
if (!file.type.startsWith('image/')) { if (!file.type.startsWith('image/')) {
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageImageFileTypeAllowed'));
toast(globalize.translate('MessageImageFileTypeAllowed'));
});
e.preventDefault(); e.preventDefault();
return false; return false;
} }
@ -100,14 +96,12 @@ import 'css!./style';
const imageType = dlg.querySelector('#selectImageType').value; const imageType = dlg.querySelector('#selectImageType').value;
if (imageType === 'None') { if (imageType === 'None') {
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageImageTypeNotSelected'));
toast(globalize.translate('MessageImageTypeNotSelected'));
});
e.preventDefault(); e.preventDefault();
return false; return false;
} }
window.connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => { ServerConnections.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
dlg.querySelector('#uploadImage').value = ''; dlg.querySelector('#uploadImage').value = '';
loading.hide(); loading.hide();
@ -134,7 +128,7 @@ import 'css!./style';
function showEditor(options, resolve) { function showEditor(options, resolve) {
options = options || {}; options = options || {};
return import('text!./imageUploader.template.html').then(({default: template}) => { return import('./imageUploader.template.html').then(({default: template}) => {
currentItemId = options.itemId; currentItemId = options.itemId;
currentServerId = options.serverId; currentServerId = options.serverId;

71
src/components/imageeditor/imageeditor.js
View file

@ -1,18 +1,21 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import dom from 'dom'; import dom from '../../scripts/dom';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import browser from 'browser'; import browser from '../../scripts/browser';
import appHost from 'apphost'; import { appHost } from '../apphost';
import 'cardStyle'; import '../cardbuilder/card.css';
import 'formDialogStyle'; import '../formdialog.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./imageeditor'; import './imageeditor.css';
import ServerConnections from '../ServerConnections';
import alert from '../alert';
import confirm from '../confirm/confirm';
/* eslint-disable indent */ /* eslint-disable indent */
@ -35,10 +38,10 @@ import 'css!./imageeditor';
let apiClient; let apiClient;
if (item) { if (item) {
apiClient = window.connectionManager.getApiClient(item.ServerId); apiClient = ServerConnections.getApiClient(item.ServerId);
reloadItem(page, item, apiClient, focusContext); reloadItem(page, item, apiClient, focusContext);
} else { } else {
apiClient = window.connectionManager.getApiClient(currentItem.ServerId); apiClient = ServerConnections.getApiClient(currentItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
reloadItem(page, item, apiClient, focusContext); reloadItem(page, item, apiClient, focusContext);
}); });
@ -199,15 +202,11 @@ import 'css!./imageeditor';
return; return;
} }
import('confirm').then(({default: confirm}) => { confirm({
confirm({ text: globalize.translate('ConfirmDeleteImage'),
confirmText: globalize.translate('Delete'),
text: globalize.translate('ConfirmDeleteImage'), primary: 'delete'
confirmText: globalize.translate('Delete'), }).then(afterConfirm);
primary: 'delete'
}).then(afterConfirm);
});
} }
function moveImage(context, apiClient, itemId, type, index, newIndex, focusContext) { function moveImage(context, apiClient, itemId, type, index, newIndex, focusContext) {
@ -215,9 +214,7 @@ import 'css!./imageeditor';
hasChanges = true; hasChanges = true;
reload(context, null, focusContext); reload(context, null, focusContext);
}, function () { }, function () {
import('alert').then(({default: alert}) => { alert(globalize.translate('ErrorDefault'));
alert(globalize.translate('ErrorDefault'));
});
}); });
} }
@ -281,7 +278,7 @@ import 'css!./imageeditor';
} }
function showImageDownloader(page, imageType) { function showImageDownloader(page, imageType) {
import('imageDownloader').then(({default: ImageDownloader}) => { import('../imageDownloader/imageDownloader').then((ImageDownloader) => {
ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () { ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () {
hasChanges = true; hasChanges = true;
reload(page); reload(page);
@ -292,14 +289,14 @@ import 'css!./imageeditor';
function showActionSheet(context, imageCard) { function showActionSheet(context, imageCard) {
const itemId = imageCard.getAttribute('data-id'); const itemId = imageCard.getAttribute('data-id');
const serverId = imageCard.getAttribute('data-serverid'); const serverId = imageCard.getAttribute('data-serverid');
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const type = imageCard.getAttribute('data-imagetype'); const type = imageCard.getAttribute('data-imagetype');
const index = parseInt(imageCard.getAttribute('data-index')); const index = parseInt(imageCard.getAttribute('data-index'));
const providerCount = parseInt(imageCard.getAttribute('data-providers')); const providerCount = parseInt(imageCard.getAttribute('data-providers'));
const numImages = parseInt(imageCard.getAttribute('data-numimages')); const numImages = parseInt(imageCard.getAttribute('data-numimages'));
import('actionsheet').then(({default: actionSheet}) => { import('../actionSheet/actionSheet').then(({default: actionSheet}) => {
const commands = []; const commands = [];
commands.push({ commands.push({
@ -370,7 +367,7 @@ import 'css!./imageeditor';
addListeners(context, 'btnOpenUploadMenu', 'click', function () { addListeners(context, 'btnOpenUploadMenu', 'click', function () {
const imageType = this.getAttribute('data-imagetype'); const imageType = this.getAttribute('data-imagetype');
import('imageUploader').then(({default: imageUploader}) => { import('../imageUploader/imageUploader').then(({default: imageUploader}) => {
imageUploader.show({ imageUploader.show({
theme: options.theme, theme: options.theme,
@ -403,7 +400,7 @@ import 'css!./imageeditor';
const type = this.getAttribute('data-imagetype'); const type = this.getAttribute('data-imagetype');
let index = this.getAttribute('data-index'); let index = this.getAttribute('data-index');
index = index === 'null' ? null : parseInt(index); index = index === 'null' ? null : parseInt(index);
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
deleteImage(context, currentItem.Id, type, index, apiClient, true); deleteImage(context, currentItem.Id, type, index, apiClient, true);
}); });
@ -411,7 +408,7 @@ import 'css!./imageeditor';
const type = this.getAttribute('data-imagetype'); const type = this.getAttribute('data-imagetype');
const index = this.getAttribute('data-index'); const index = this.getAttribute('data-index');
const newIndex = this.getAttribute('data-newindex'); const newIndex = this.getAttribute('data-newindex');
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer')); moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer'));
}); });
} }
@ -422,8 +419,8 @@ import 'css!./imageeditor';
loading.show(); loading.show();
import('text!./imageeditor.template.html').then(({default: template}) => { import('./imageeditor.template.html').then(({default: template}) => {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
const dialogOptions = { const dialogOptions = {
removeOnClose: true removeOnClose: true

13
src/components/images/imageLoader.js
View file

@ -1,7 +1,7 @@
import * as lazyLoader from 'lazyLoader'; import * as lazyLoader from '../lazyLoader/lazyLoaderIntersectionObserver';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import * as blurhash from 'blurhash'; import { decode, isBlurhashValid } from 'blurhash';
import 'css!./style'; import './style.css';
/* eslint-disable indent */ /* eslint-disable indent */
export function lazyImage(elem, source = elem.getAttribute('data-src')) { export function lazyImage(elem, source = elem.getAttribute('data-src')) {
@ -13,7 +13,7 @@ import 'css!./style';
} }
function itemBlurhashing(target, blurhashstr) { function itemBlurhashing(target, blurhashstr) {
if (blurhash.isBlurhashValid(blurhashstr)) { if (isBlurhashValid(blurhashstr)) {
// Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us, // Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us,
// improving the performance and reducing the memory usage, while retaining almost full blur quality. // improving the performance and reducing the memory usage, while retaining almost full blur quality.
// Lower values had more visible pixelation // Lower values had more visible pixelation
@ -21,7 +21,7 @@ import 'css!./style';
const height = 18; const height = 18;
let pixels; let pixels;
try { try {
pixels = blurhash.decode(blurhashstr, width, height); pixels = decode(blurhashstr, width, height);
} catch (err) { } catch (err) {
console.error('Blurhash decode error: ', err); console.error('Blurhash decode error: ', err);
target.classList.add('non-blurhashable'); target.classList.add('non-blurhashable');
@ -133,6 +133,7 @@ import 'css!./style';
} }
} }
} }
lazyLoader.lazyChildren(elem, fillImage); lazyLoader.lazyChildren(elem, fillImage);
} }

10
src/components/indicators/indicators.js
View file

@ -1,8 +1,8 @@
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import itemHelper from 'itemHelper'; import itemHelper from '../itemHelper';
import 'emby-progressbar'; import '../../elements/emby-progressbar/emby-progressbar';
import 'css!./indicators.css'; import './indicators.css';
import 'material-icons'; import 'material-design-icons-iconfont';
export function enableProgressIndicator(item) { export function enableProgressIndicator(item) {
if (item.MediaType === 'Video' && item.Type !== 'TvChannel') { if (item.MediaType === 'Video' && item.Type !== 'TvChannel') {

56
src/components/itemContextMenu.js
View file

@ -1,10 +1,12 @@
import appHost from 'apphost'; import browser from '../scripts/browser';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import itemHelper from 'itemHelper'; import actionsheet from './actionSheet/actionSheet';
import appRouter from 'appRouter'; import { appHost } from './apphost';
import playbackManager from 'playbackManager'; import { appRouter } from './appRouter';
import browser from 'browser'; import itemHelper from './itemHelper';
import actionsheet from 'actionsheet'; import { playbackManager } from './playback/playbackmanager';
import ServerConnections from './ServerConnections';
import toast from './toast/toast';
/* eslint-disable indent */ /* eslint-disable indent */
export function getCommands(options) { export function getCommands(options) {
@ -329,12 +331,12 @@ import actionsheet from 'actionsheet';
function executeCommand(item, id, options) { function executeCommand(item, id, options) {
const itemId = item.Id; const itemId = item.Id;
const serverId = item.ServerId; const serverId = item.ServerId;
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
switch (id) { switch (id) {
case 'addtocollection': case 'addtocollection':
import('collectionEditor').then(({default: collectionEditor}) => { import('./collectionEditor/collectionEditor').then(({default: collectionEditor}) => {
new collectionEditor({ new collectionEditor({
items: [itemId], items: [itemId],
serverId: serverId serverId: serverId
@ -342,7 +344,7 @@ import actionsheet from 'actionsheet';
}); });
break; break;
case 'addtoplaylist': case 'addtoplaylist':
import('playlistEditor').then(({default: playlistEditor}) => { import('./playlisteditor/playlisteditor').then(({default: playlistEditor}) => {
new playlistEditor({ new playlistEditor({
items: [itemId], items: [itemId],
serverId: serverId serverId: serverId
@ -350,7 +352,7 @@ import actionsheet from 'actionsheet';
}); });
break; break;
case 'download': case 'download':
import('fileDownloader').then((fileDownloader) => { import('../scripts/fileDownloader').then((fileDownloader) => {
const downloadHref = apiClient.getItemDownloadUrl(itemId); const downloadHref = apiClient.getItemDownloadUrl(itemId);
fileDownloader.download([{ fileDownloader.download([{
url: downloadHref, url: downloadHref,
@ -372,9 +374,7 @@ import actionsheet from 'actionsheet';
textArea.select(); textArea.select();
if (document.execCommand('copy')) { if (document.execCommand('copy')) {
import('toast').then(({default: toast}) => { toast(globalize.translate('CopyStreamURLSuccess'));
toast(globalize.translate('CopyStreamURLSuccess'));
});
} else { } else {
prompt(globalize.translate('CopyStreamURL'), downloadHref); prompt(globalize.translate('CopyStreamURL'), downloadHref);
} }
@ -387,9 +387,7 @@ import actionsheet from 'actionsheet';
} else { } else {
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
navigator.clipboard.writeText(downloadHref).then(function () { navigator.clipboard.writeText(downloadHref).then(function () {
import('toast').then(({default: toast}) => { toast(globalize.translate('CopyStreamURLSuccess'));
toast(globalize.translate('CopyStreamURLSuccess'));
});
}).catch(function () { }).catch(function () {
textAreaCopy(); textAreaCopy();
}); });
@ -398,7 +396,7 @@ import actionsheet from 'actionsheet';
break; break;
} }
case 'editsubtitles': case 'editsubtitles':
import('subtitleEditor').then(({default: subtitleEditor}) => { import('./subtitleeditor/subtitleeditor').then(({default: subtitleEditor}) => {
subtitleEditor.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id)); subtitleEditor.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
}); });
break; break;
@ -406,7 +404,7 @@ import actionsheet from 'actionsheet';
editItem(apiClient, item).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id)); editItem(apiClient, item).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
break; break;
case 'editimages': case 'editimages':
import('imageEditor').then(({default: imageEditor}) => { import('./imageeditor/imageeditor').then((imageEditor) => {
imageEditor.show({ imageEditor.show({
itemId: itemId, itemId: itemId,
serverId: serverId serverId: serverId
@ -414,12 +412,12 @@ import actionsheet from 'actionsheet';
}); });
break; break;
case 'identify': case 'identify':
import('itemIdentifier').then(({default: itemIdentifier}) => { import('./itemidentifier/itemidentifier').then((itemIdentifier) => {
itemIdentifier.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id)); itemIdentifier.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
}); });
break; break;
case 'moremediainfo': case 'moremediainfo':
import('itemMediaInfo').then(({default: itemMediaInfo}) => { import('./itemMediaInfo/itemMediaInfo').then((itemMediaInfo) => {
itemMediaInfo.show(itemId, serverId).then(getResolveFunction(resolve, id), getResolveFunction(resolve, id)); itemMediaInfo.show(itemId, serverId).then(getResolveFunction(resolve, id), getResolveFunction(resolve, id));
}); });
break; break;
@ -454,7 +452,7 @@ import actionsheet from 'actionsheet';
playbackManager.clearQueue(); playbackManager.clearQueue();
break; break;
case 'record': case 'record':
import('recordingCreator').then(({default: recordingCreator}) => { import('./recordingcreator/recordingcreator').then(({default: recordingCreator}) => {
recordingCreator.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id)); recordingCreator.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
}); });
break; break;
@ -525,7 +523,7 @@ import actionsheet from 'actionsheet';
} }
function deleteTimer(apiClient, item, resolve, command) { function deleteTimer(apiClient, item, resolve, command) {
import('recordingHelper').then(({default: recordingHelper}) => { import('./recordingcreator/recordinghelper').then(({default: recordingHelper}) => {
const timerId = item.TimerId || item.Id; const timerId = item.TimerId || item.Id;
recordingHelper.cancelTimerWithConfirmation(timerId, item.ServerId).then(function () { recordingHelper.cancelTimerWithConfirmation(timerId, item.ServerId).then(function () {
getResolveFunction(resolve, command, true)(); getResolveFunction(resolve, command, true)();
@ -534,7 +532,7 @@ import actionsheet from 'actionsheet';
} }
function deleteSeriesTimer(apiClient, item, resolve, command) { function deleteSeriesTimer(apiClient, item, resolve, command) {
import('recordingHelper').then(({default: recordingHelper}) => { import('./recordingcreator/recordinghelper').then(({default: recordingHelper}) => {
recordingHelper.cancelSeriesTimerWithConfirmation(item.Id, item.ServerId).then(function () { recordingHelper.cancelSeriesTimerWithConfirmation(item.Id, item.ServerId).then(function () {
getResolveFunction(resolve, command, true)(); getResolveFunction(resolve, command, true)();
}); });
@ -568,15 +566,15 @@ import actionsheet from 'actionsheet';
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
if (item.Type === 'Timer') { if (item.Type === 'Timer') {
import('recordingEditor').then(({default: recordingEditor}) => { import('./recordingcreator/recordingeditor').then(({default: recordingEditor}) => {
recordingEditor.show(item.Id, serverId).then(resolve, reject); recordingEditor.show(item.Id, serverId).then(resolve, reject);
}); });
} else if (item.Type === 'SeriesTimer') { } else if (item.Type === 'SeriesTimer') {
import('seriesRecordingEditor').then(({default: recordingEditor}) => { import('./recordingcreator/seriesrecordingeditor').then(({default: recordingEditor}) => {
recordingEditor.show(item.Id, serverId).then(resolve, reject); recordingEditor.show(item.Id, serverId).then(resolve, reject);
}); });
} else { } else {
import('metadataEditor').then(({default: metadataEditor}) => { import('./metadataEditor/metadataEditor').then(({default: metadataEditor}) => {
metadataEditor.show(item.Id, serverId).then(resolve, reject); metadataEditor.show(item.Id, serverId).then(resolve, reject);
}); });
} }
@ -585,7 +583,7 @@ import actionsheet from 'actionsheet';
function deleteItem(apiClient, item) { function deleteItem(apiClient, item) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('deleteHelper').then(({default: deleteHelper}) => { import('../scripts/deleteHelper').then((deleteHelper) => {
deleteHelper.deleteItem({ deleteHelper.deleteItem({
item: item, item: item,
navigate: false navigate: false
@ -597,7 +595,7 @@ import actionsheet from 'actionsheet';
} }
function refresh(apiClient, item) { function refresh(apiClient, item) {
import('refreshDialog').then(({default: refreshDialog}) => { import('./refreshdialog/refreshdialog').then(({default: refreshDialog}) => {
new refreshDialog({ new refreshDialog({
itemIds: [item.Id], itemIds: [item.Id],
serverId: apiClient.serverInfo().Id, serverId: apiClient.serverInfo().Id,

4
src/components/itemHelper.js
View file

@ -1,5 +1,5 @@
import appHost from 'apphost'; import { appHost } from './apphost';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
export function getDisplayName(item, options = {}) { export function getDisplayName(item, options = {}) {
if (!item) { if (!item) {

27
src/components/itemMediaInfo/itemMediaInfo.js
View file

@ -5,17 +5,18 @@
* @module components/itemMediaInfo/itemMediaInfo * @module components/itemMediaInfo/itemMediaInfo
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import loading from '../loading/loading';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'listViewStyle'; import '../listview/listview.css';
import 'paper-icon-button-light'; import '../../elements/emby-button/emby-button';
import 'css!./../formdialog'; import '../../elements/emby-button/paper-icon-button-light';
import 'material-icons'; import '../formdialog.css';
import 'emby-button'; import 'material-design-icons-iconfont';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
function setMediaInfo(user, page, item) { function setMediaInfo(user, page, item) {
let html = item.MediaSources.map(version => { let html = item.MediaSources.map(version => {
@ -162,7 +163,7 @@ import 'flexStyles';
} }
function loadMediaInfo(itemId, serverId, template) { function loadMediaInfo(itemId, serverId, template) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => { return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
const dialogOptions = { const dialogOptions = {
size: 'small', size: 'small',
@ -193,7 +194,7 @@ import 'flexStyles';
export function show(itemId, serverId) { export function show(itemId, serverId) {
loading.show(); loading.show();
return import('text!./itemMediaInfo.template.html').then(({default: template}) => { return import('./itemMediaInfo.template.html').then(({default: template}) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
loadMediaInfo(itemId, serverId, template).then(resolve, reject); loadMediaInfo(itemId, serverId, template).then(resolve, reject);
}); });

38
src/components/itemidentifier/itemidentifier.js
View file

@ -5,19 +5,21 @@
* @module components/itemidentifier/itemidentifier * @module components/itemidentifier/itemidentifier
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import browser from 'browser'; import browser from '../../scripts/browser';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./../formdialog'; import '../formdialog.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'cardStyle'; import '../cardbuilder/card.css';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
const enableFocusTransform = !browser.slow && !browser.edge; const enableFocusTransform = !browser.slow && !browser.edge;
@ -30,7 +32,7 @@ import 'cardStyle';
let currentSearchResult; let currentSearchResult;
function getApiClient() { function getApiClient() {
return window.connectionManager.getApiClient(currentServerId); return ServerConnections.getApiClient(currentServerId);
} }
function searchForIdentificationResults(page) { function searchForIdentificationResults(page) {
@ -67,9 +69,7 @@ import 'cardStyle';
} }
if (!hasId && !lookupInfo.Name) { if (!hasId && !lookupInfo.Name) {
import('toast').then(({default: toast}) => { toast(globalize.translate('PleaseEnterNameOrId'));
toast(globalize.translate('PleaseEnterNameOrId'));
});
return; return;
} }
@ -334,7 +334,7 @@ import 'cardStyle';
function showEditor(itemId) { function showEditor(itemId) {
loading.show(); loading.show();
return import('text!./itemidentifier.template.html').then(({default: template}) => { return import('./itemidentifier.template.html').then(({default: template}) => {
const apiClient = getApiClient(); const apiClient = getApiClient();
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => { apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
@ -416,7 +416,7 @@ import 'cardStyle';
currentItem = null; currentItem = null;
currentItemType = itemType; currentItemType = itemType;
return import('text!./itemidentifier.template.html').then(({default: template}) => { return import('./itemidentifier.template.html').then(({default: template}) => {
const dialogOptions = { const dialogOptions = {
size: 'small', size: 'small',
removeOnClose: true, removeOnClose: true,

10
src/components/itemsrefresher.js
View file

@ -1,6 +1,6 @@
import playbackManager from 'playbackManager'; import { playbackManager } from './playback/playbackmanager';
import serverNotifications from 'serverNotifications'; import serverNotifications from '../scripts/serverNotifications';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
function onUserDataChanged(e, apiClient, userData) { function onUserDataChanged(e, apiClient, userData) {
const instance = this; const instance = this;
@ -110,7 +110,7 @@ function onPlaybackStopped(e, stopInfo) {
function addNotificationEvent(instance, name, handler, owner) { function addNotificationEvent(instance, name, handler, owner) {
const localHandler = handler.bind(instance); const localHandler = handler.bind(instance);
owner = owner || serverNotifications; owner = owner || serverNotifications;
events.on(owner, name, localHandler); Events.on(owner, name, localHandler);
instance['event_' + name] = localHandler; instance['event_' + name] = localHandler;
} }
@ -118,7 +118,7 @@ function removeNotificationEvent(instance, name, owner) {
const handler = instance['event_' + name]; const handler = instance['event_' + name];
if (handler) { if (handler) {
owner = owner || serverNotifications; owner = owner || serverNotifications;
events.off(owner, name, handler); Events.off(owner, name, handler);
instance['event_' + name] = null; instance['event_' + name] = null;
} }
} }

22
src/components/layoutManager.js
View file

@ -1,6 +1,8 @@
import browser from 'browser';
import appSettings from 'appSettings'; import { appHost } from './apphost';
import events from 'events'; import browser from '../scripts/browser';
import appSettings from '../scripts/settings/appSettings';
import { Events } from 'jellyfin-apiclient';
function setLayout(instance, layout, selectedLayout) { function setLayout(instance, layout, selectedLayout) {
if (layout === selectedLayout) { if (layout === selectedLayout) {
@ -30,10 +32,10 @@ class LayoutManager {
} }
} }
events.trigger(this, 'modechange'); Events.trigger(this, 'modechange');
} }
getSavedLayout(layout) { getSavedLayout() {
return appSettings.get('layout'); return appSettings.get('layout');
} }
@ -58,4 +60,12 @@ class LayoutManager {
} }
} }
export default new LayoutManager(); const layoutManager = new LayoutManager();
if (appHost.getDefaultLayout) {
layoutManager.defaultLayout = appHost.getDefaultLayout();
}
layoutManager.init();
export default layoutManager;

17
src/components/libraryoptionseditor/libraryoptionseditor.js
View file

@ -5,11 +5,11 @@
* @module components/libraryoptionseditor/libraryoptionseditor * @module components/libraryoptionseditor/libraryoptionseditor
*/ */
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'emby-input'; import '../../elements/emby-input/emby-input';
function populateLanguages(parent) { function populateLanguages(parent) {
return ApiClient.getCultures().then(languages => { return ApiClient.getCultures().then(languages => {
@ -304,7 +304,7 @@ import 'emby-input';
} }
function showImageOptionsForType(type) { function showImageOptionsForType(type) {
import('imageoptionseditor').then(({default: ImageOptionsEditor}) => { import('../imageOptionsEditor/imageOptionsEditor').then(({default: ImageOptionsEditor}) => {
let typeOptions = getTypeOptions(currentLibraryOptions, type); let typeOptions = getTypeOptions(currentLibraryOptions, type);
if (!typeOptions) { if (!typeOptions) {
typeOptions = { typeOptions = {
@ -362,8 +362,9 @@ import 'emby-input';
currentAvailableOptions = null; currentAvailableOptions = null;
const isNewLibrary = libraryOptions === null; const isNewLibrary = libraryOptions === null;
isNewLibrary && parent.classList.add('newlibrary'); isNewLibrary && parent.classList.add('newlibrary');
const response = await fetch('components/libraryoptionseditor/libraryoptionseditor.template.html');
const template = await response.text(); const { default: template } = await import('./libraryoptionseditor.template.html');
parent.innerHTML = globalize.translateHtml(template); parent.innerHTML = globalize.translateHtml(template);
populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval')); populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval'));
const promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))]; const promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))];

25
src/components/listview/listview.js
View file

@ -5,16 +5,17 @@
* @module components/listview/listview * @module components/listview/listview
*/ */
import itemHelper from 'itemHelper'; import itemHelper from '../itemHelper';
import mediaInfo from 'mediaInfo'; import mediaInfo from '../mediainfo/mediainfo';
import indicators from 'indicators'; import indicators from '../indicators/indicators';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import cardBuilder from 'cardBuilder'; import cardBuilder from '../cardbuilder/cardBuilder';
import 'css!./listview'; import './listview.css';
import 'emby-ratingbutton'; import '../../elements/emby-ratingbutton/emby-ratingbutton';
import 'emby-playstatebutton'; import '../../elements/emby-playstatebutton/emby-playstatebutton';
import ServerConnections from '../ServerConnections';
function getIndex(item, options) { function getIndex(item, options) {
if (options.index === 'disc') { if (options.index === 'disc') {
@ -76,7 +77,7 @@ import 'emby-playstatebutton';
} }
function getImageUrl(item, width) { function getImageUrl(item, width) {
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
let itemId; let itemId;
const options = { const options = {
@ -105,7 +106,7 @@ import 'emby-playstatebutton';
} }
function getChannelImageUrl(item, width) { function getChannelImageUrl(item, width) {
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
const options = { const options = {
maxWidth: width, maxWidth: width,
type: 'Primary' type: 'Primary'

2
src/components/loading/loading.js
View file

@ -1,4 +1,4 @@
import 'css!./loading'; import './loading.css';
let loadingElem; let loadingElem;
let layer1; let layer1;

16
src/components/maintabsmanager.js
View file

@ -1,8 +1,8 @@
import dom from 'dom'; import dom from '../scripts/dom';
import browser from 'browser'; import browser from '../scripts/browser';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import 'emby-tabs'; import '../elements/emby-tabs/emby-tabs';
import 'emby-button'; import '../elements/emby-button/emby-button';
/* eslint-disable indent */ /* eslint-disable indent */
@ -65,11 +65,11 @@ import 'emby-button';
} }
}; };
import('touchHelper').then(({default: TouchHelper}) => { import('../scripts/touchHelper').then(({default: TouchHelper}) => {
const touchHelper = new TouchHelper(view.parentNode.parentNode); const touchHelper = new TouchHelper(view.parentNode.parentNode);
events.on(touchHelper, 'swipeleft', onSwipeLeft); Events.on(touchHelper, 'swipeleft', onSwipeLeft);
events.on(touchHelper, 'swiperight', onSwipeRight); Events.on(touchHelper, 'swiperight', onSwipeRight);
view.addEventListener('viewdestroy', function () { view.addEventListener('viewdestroy', function () {
touchHelper.destroy(); touchHelper.destroy();

46
src/components/mediaLibraryCreator/mediaLibraryCreator.js
View file

@ -5,20 +5,22 @@
* @module components/mediaLibraryCreator/mediaLibraryCreator * @module components/mediaLibraryCreator/mediaLibraryCreator
*/ */
import loading from 'loading'; import loading from '../loading/loading';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import $ from 'jQuery'; import 'jquery';
import libraryoptionseditor from 'components/libraryoptionseditor/libraryoptionseditor'; import libraryoptionseditor from '../libraryoptionseditor/libraryoptionseditor';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-toggle'; import '../../elements/emby-button/emby-button';
import 'emby-input'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-select'; import '../../elements/emby-input/emby-input';
import 'paper-icon-button-light'; import '../../elements/emby-select/emby-select';
import 'listViewStyle'; import '../../elements/emby-toggle/emby-toggle';
import 'formDialogStyle'; import '../listview/listview.css';
import 'emby-button'; import '../formdialog.css';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import toast from '../toast/toast';
import alert from '../alert';
function onAddLibrary() { function onAddLibrary() {
if (isCreating) { if (isCreating) {
@ -26,11 +28,9 @@ import 'flexStyles';
} }
if (pathInfos.length == 0) { if (pathInfos.length == 0) {
import('alert').then(({default: alert}) => { alert({
alert({ text: globalize.translate('PleaseAddAtLeastOneFolder'),
text: globalize.translate('PleaseAddAtLeastOneFolder'), type: 'error'
type: 'error'
});
}); });
return false; return false;
@ -54,9 +54,7 @@ import 'flexStyles';
loading.hide(); loading.hide();
dialogHelper.close(dlg); dialogHelper.close(dlg);
}, () => { }, () => {
import('toast').then(({default: toast}) => { toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
});
isCreating = false; isCreating = false;
loading.hide(); loading.hide();
@ -109,7 +107,7 @@ import 'flexStyles';
function onAddButtonClick() { function onAddButtonClick() {
const page = dom.parentWithClass(this, 'dlg-librarycreator'); const page = dom.parentWithClass(this, 'dlg-librarycreator');
import('directorybrowser').then(({default: directoryBrowser}) => { import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser(); const picker = new directoryBrowser();
picker.show({ picker.show({
enableNetworkSharePath: true, enableNetworkSharePath: true,
@ -200,7 +198,7 @@ export class showEditor {
currentOptions = options; currentOptions = options;
currentResolve = resolve; currentResolve = resolve;
hasChanges = false; hasChanges = false;
import('text!./components/mediaLibraryCreator/mediaLibraryCreator.template.html').then(({default: template}) => { import('./mediaLibraryCreator.template.html').then(({default: template}) => {
const dlg = dialogHelper.createDialog({ const dlg = dialogHelper.createDialog({
size: 'small', size: 'small',
modal: false, modal: false,

66
src/components/mediaLibraryEditor/mediaLibraryEditor.js
View file

@ -5,18 +5,20 @@
* @module components/mediaLibraryEditor/mediaLibraryEditor * @module components/mediaLibraryEditor/mediaLibraryEditor
*/ */
import jQuery from 'jQuery'; import 'jquery';
import loading from 'loading'; import loading from '../loading/loading';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import libraryoptionseditor from 'components/libraryoptionseditor/libraryoptionseditor'; import libraryoptionseditor from '../libraryoptionseditor/libraryoptionseditor';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'listViewStyle'; import '../listview/listview.css';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'formDialogStyle'; import '../formdialog.css';
import 'emby-toggle'; import '../../elements/emby-toggle/emby-toggle';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import toast from '../toast/toast';
import confirm from '../confirm/confirm';
function onEditLibrary() { function onEditLibrary() {
if (isCreating) { if (isCreating) {
@ -47,9 +49,7 @@ import 'flexStyles';
hasChanges = true; hasChanges = true;
refreshLibraryFromServer(page); refreshLibraryFromServer(page);
}, () => { }, () => {
import('toast').then(({default: toast}) => { toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
});
}); });
} }
@ -62,9 +62,7 @@ import 'flexStyles';
hasChanges = true; hasChanges = true;
refreshLibraryFromServer(page); refreshLibraryFromServer(page);
}, () => { }, () => {
import('toast').then(({default: toast}) => { toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
});
}); });
} }
@ -72,22 +70,18 @@ import 'flexStyles';
const button = btnRemovePath; const button = btnRemovePath;
const virtualFolder = currentOptions.library; const virtualFolder = currentOptions.library;
import('confirm').then(({default: confirm}) => { confirm({
confirm({ title: globalize.translate('HeaderRemoveMediaLocation'),
title: globalize.translate('HeaderRemoveMediaLocation'), text: globalize.translate('MessageConfirmRemoveMediaLocation'),
text: globalize.translate('MessageConfirmRemoveMediaLocation'), confirmText: globalize.translate('Delete'),
confirmText: globalize.translate('Delete'), primary: 'delete'
primary: 'delete' }).then(() => {
}).then(() => { const refreshAfterChange = currentOptions.refresh;
const refreshAfterChange = currentOptions.refresh; ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(() => {
ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(() => { hasChanges = true;
hasChanges = true; refreshLibraryFromServer(dom.parentWithClass(button, 'dlg-libraryeditor'));
refreshLibraryFromServer(dom.parentWithClass(button, 'dlg-libraryeditor')); }, () => {
}, () => { toast(globalize.translate('ErrorDefault'));
import('toast').then(({default: toast}) => {
toast(globalize.translate('ErrorDefault'));
});
});
}); });
}); });
} }
@ -167,7 +161,7 @@ import 'flexStyles';
} }
function showDirectoryBrowser(context, originalPath, networkPath) { function showDirectoryBrowser(context, originalPath, networkPath) {
import('directorybrowser').then(({default: directoryBrowser}) => { import('../directorybrowser/directorybrowser').then(({default: directoryBrowser}) => {
const picker = new directoryBrowser(); const picker = new directoryBrowser();
picker.show({ picker.show({
enableNetworkSharePath: true, enableNetworkSharePath: true,
@ -215,7 +209,7 @@ export class showEditor {
currentOptions = options; currentOptions = options;
currentDeferred = deferred; currentDeferred = deferred;
hasChanges = false; hasChanges = false;
import('text!./components/mediaLibraryEditor/mediaLibraryEditor.template.html').then(({default: template}) => { import('./mediaLibraryEditor.template.html').then(({default: template}) => {
const dlg = dialogHelper.createDialog({ const dlg = dialogHelper.createDialog({
size: 'small', size: 'small',
modal: false, modal: false,

18
src/components/mediainfo/mediainfo.js
View file

@ -1,12 +1,12 @@
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import itemHelper from 'itemHelper'; import itemHelper from '../itemHelper';
import indicators from 'indicators'; import indicators from '../indicators/indicators';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'css!./mediainfo.css'; import './mediainfo.css';
import 'programStyles'; import '../guide/programs.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
/* eslint-disable indent */ /* eslint-disable indent */
function getTimerIndicator(item) { function getTimerIndicator(item) {

69
src/components/metadataEditor/metadataEditor.js
View file

@ -1,21 +1,24 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import loading from 'loading'; import loading from '../loading/loading';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import shell from 'shell'; import shell from '../../scripts/shell';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'listViewStyle'; import '../listview/listview.css';
import 'emby-textarea'; import '../../elements/emby-textarea/emby-textarea';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./../formdialog'; import '../formdialog.css';
import 'clearButtonStyle'; import '../../assets/css/clearbutton.scss';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
import { appRouter } from '../appRouter';
/* eslint-disable indent */ /* eslint-disable indent */
@ -35,9 +38,7 @@ import 'flexStyles';
function submitUpdatedItem(form, item) { function submitUpdatedItem(form, item) {
function afterContentTypeUpdated() { function afterContentTypeUpdated() {
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageItemSaved'));
toast(globalize.translate('MessageItemSaved'));
});
loading.hide(); loading.hide();
closeDialog(true); closeDialog(true);
@ -207,7 +208,7 @@ import 'flexStyles';
} }
function addElementToList(source, sortCallback) { function addElementToList(source, sortCallback) {
import('prompt').then(({default: prompt}) => { import('../prompt/prompt').then(({default: prompt}) => {
prompt({ prompt({
label: 'Value:' label: 'Value:'
}).then(function (text) { }).then(function (text) {
@ -225,7 +226,7 @@ import 'flexStyles';
} }
function editPerson(context, person, index) { function editPerson(context, person, index) {
import('personEditor').then(({default: personEditor}) => { import('./personEditor').then(({default: personEditor}) => {
personEditor.show(person).then(function (updatedPerson) { personEditor.show(person).then(function (updatedPerson) {
const isNew = index === -1; const isNew = index === -1;
@ -244,14 +245,12 @@ import 'flexStyles';
if (parentId) { if (parentId) {
reload(context, parentId, item.ServerId); reload(context, parentId, item.ServerId);
} else { } else {
import('appRouter').then(({default: appRouter}) => { appRouter.goHome();
appRouter.goHome();
});
} }
} }
function showMoreMenu(context, button, user) { function showMoreMenu(context, button, user) {
import('itemContextMenu').then(({default: itemContextMenu}) => { import('../itemContextMenu').then(({default: itemContextMenu}) => {
const item = currentItem; const item = currentItem;
itemContextMenu.show({ itemContextMenu.show({
@ -289,7 +288,7 @@ import 'flexStyles';
} }
function getApiClient() { function getApiClient() {
return window.connectionManager.getApiClient(currentItem.ServerId); return ServerConnections.getApiClient(currentItem.ServerId);
} }
function bindAll(elems, eventName, fn) { function bindAll(elems, eventName, fn) {
@ -369,7 +368,7 @@ import 'flexStyles';
} }
function getItem(itemId, serverId) { function getItem(itemId, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getItem(apiClient.getCurrentUserId(), itemId); return apiClient.getItem(apiClient.getCurrentUserId(), itemId);
@ -379,7 +378,7 @@ import 'flexStyles';
} }
function getEditorConfig(itemId, serverId) { function getEditorConfig(itemId, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
if (itemId) { if (itemId) {
return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor')); return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
@ -1020,7 +1019,7 @@ import 'flexStyles';
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -1029,7 +1028,7 @@ import 'flexStyles';
function show(itemId, serverId, resolve, reject) { function show(itemId, serverId, resolve, reject) {
loading.show(); loading.show();
import('text!./metadataEditor.template.html').then(({default: template}) => { import('./metadataEditor.template.html').then(({default: template}) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
@ -1067,7 +1066,7 @@ import 'flexStyles';
currentContext = dlg; currentContext = dlg;
init(dlg, window.connectionManager.getApiClient(serverId)); init(dlg, ServerConnections.getApiClient(serverId));
reload(dlg, itemId, serverId); reload(dlg, itemId, serverId);
}); });
@ -1084,7 +1083,7 @@ import 'flexStyles';
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
loading.show(); loading.show();
import('text!./metadataEditor.template.html').then(({default: template}) => { import('./metadataEditor.template.html').then(({default: template}) => {
elem.innerHTML = globalize.translateHtml(template, 'core'); elem.innerHTML = globalize.translateHtml(template, 'core');
elem.querySelector('.formDialogFooter').classList.remove('formDialogFooter'); elem.querySelector('.formDialogFooter').classList.remove('formDialogFooter');
@ -1094,7 +1093,7 @@ import 'flexStyles';
currentContext = elem; currentContext = elem;
init(elem, window.connectionManager.getApiClient(serverId)); init(elem, ServerConnections.getApiClient(serverId));
reload(elem, itemId, serverId); reload(elem, itemId, serverId);
focusManager.autoFocus(elem); focusManager.autoFocus(elem);

19
src/components/metadataEditor/personEditor.js
View file

@ -1,15 +1,16 @@
import dialogHelper from 'dialogHelper';
import layoutManager from 'layoutManager'; import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from 'globalize'; import layoutManager from '../layoutManager';
import 'paper-icon-button-light'; import globalize from '../../scripts/globalize';
import 'emby-input'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-select'; import '../../elements/emby-input/emby-input';
import 'css!./../formdialog'; import '../../elements/emby-select/emby-select';
import '../formdialog.css';
/* eslint-disable indent */ /* eslint-disable indent */
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -17,7 +18,7 @@ import 'css!./../formdialog';
function show(person) { function show(person) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('text!./personEditor.template.html').then(({default: template}) => { import('./personEditor.template.html').then(({default: template}) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

1
src/components/multiSelect/multiSelect.css
View file

@ -1,3 +1,4 @@
.itemSelectionPanel { .itemSelectionPanel {
position: absolute; position: absolute;
bottom: 0; bottom: 0;

65
src/components/multiSelect/multiSelect.js
View file

@ -1,9 +1,13 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import appHost from 'apphost'; import { appHost } from '../apphost';
import loading from 'loading'; import loading from '../loading/loading';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'css!./multiSelect'; import './multiSelect.css';
import ServerConnections from '../ServerConnections';
import alert from '../alert';
import playlistEditor from '../playlisteditor/playlisteditor';
import confirm from '../confirm/confirm';
/* eslint-disable indent */ /* eslint-disable indent */
@ -137,10 +141,8 @@ import 'css!./multiSelect';
} }
function alertText(options) { function alertText(options) {
return new Promise((resolve, reject) => { return new Promise((resolve) => {
import('alert').then(({default: alert}) => { alert(options).then(resolve, resolve);
alert(options).then(resolve, resolve);
});
}); });
} }
@ -154,22 +156,20 @@ import 'css!./multiSelect';
title = globalize.translate('HeaderDeleteItems'); title = globalize.translate('HeaderDeleteItems');
} }
import('confirm').then(({default: confirm}) => { confirm(msg, title).then(() => {
confirm(msg, title).then(() => { const promises = itemIds.map(itemId => {
const promises = itemIds.map(itemId => { apiClient.deleteItem(itemId);
apiClient.deleteItem(itemId); });
});
Promise.all(promises).then(resolve, () => { Promise.all(promises).then(resolve, () => {
alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject); alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
}); });
}, reject); }, reject);
});
}); });
} }
function showMenuForSelectedItems(e) { function showMenuForSelectedItems(e) {
const apiClient = window.connectionManager.currentApiClient(); const apiClient = ServerConnections.currentApiClient();
apiClient.getCurrentUser().then(user => { apiClient.getCurrentUser().then(user => {
const menuItems = []; const menuItems = [];
@ -229,7 +229,7 @@ import 'css!./multiSelect';
icon: 'refresh' icon: 'refresh'
}); });
import('actionsheet').then(({default: actionsheet}) => { import('../actionSheet/actionSheet').then((actionsheet) => {
actionsheet.show({ actionsheet.show({
items: menuItems, items: menuItems,
positionTo: e.target, positionTo: e.target,
@ -239,7 +239,7 @@ import 'css!./multiSelect';
switch (id) { switch (id) {
case 'addtocollection': case 'addtocollection':
import('collectionEditor').then(({default: collectionEditor}) => { import('../collectionEditor/collectionEditor').then(({default: collectionEditor}) => {
new collectionEditor({ new collectionEditor({
items: items, items: items,
serverId: serverId serverId: serverId
@ -249,11 +249,9 @@ import 'css!./multiSelect';
dispatchNeedsRefresh(); dispatchNeedsRefresh();
break; break;
case 'playlist': case 'playlist':
import('playlistEditor').then(({default: playlistEditor}) => { new playlistEditor({
new playlistEditor({ items: items,
items: items, serverId: serverId
serverId: serverId
});
}); });
hideSelections(); hideSelections();
dispatchNeedsRefresh(); dispatchNeedsRefresh();
@ -281,7 +279,7 @@ import 'css!./multiSelect';
dispatchNeedsRefresh(); dispatchNeedsRefresh();
break; break;
case 'refresh': case 'refresh':
import('refreshDialog').then(({default: refreshDialog}) => { import('../refreshdialog/refreshdialog').then(({default: refreshDialog}) => {
new refreshDialog({ new refreshDialog({
itemIds: items, itemIds: items,
serverId: serverId serverId: serverId
@ -317,11 +315,8 @@ import 'css!./multiSelect';
function combineVersions(apiClient, selection) { function combineVersions(apiClient, selection) {
if (selection.length < 2) { if (selection.length < 2) {
import('alert').then(({default: alert}) => { alert({
alert({ text: globalize.translate('PleaseSelectTwoItems')
text: globalize.translate('PleaseSelectTwoItems')
});
}); });
return; return;
} }
@ -341,7 +336,7 @@ import 'css!./multiSelect';
} }
function showSelections(initialCard) { function showSelections(initialCard) {
import('emby-checkbox').then(() => { import('../../elements/emby-checkbox/emby-checkbox').then(() => {
const cards = document.querySelectorAll('.card'); const cards = document.querySelectorAll('.card');
for (let i = 0, length = cards.length; i < length; i++) { for (let i = 0, length = cards.length; i < length; i++) {
showSelection(cards[i], initialCard === cards[i]); showSelection(cards[i], initialCard === cards[i]);

24
src/components/notifications/notifications.js
View file

@ -1,7 +1,7 @@
import serverNotifications from 'serverNotifications'; import serverNotifications from '../../scripts/serverNotifications';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
function onOneDocumentClick() { function onOneDocumentClick() {
document.removeEventListener('click', onOneDocumentClick); document.removeEventListener('click', onOneDocumentClick);
@ -199,27 +199,27 @@ function showPackageInstallNotification(apiClient, installation, status) {
}); });
} }
events.on(serverNotifications, 'LibraryChanged', function (e, apiClient, data) { Events.on(serverNotifications, 'LibraryChanged', function (e, apiClient, data) {
onLibraryChanged(data, apiClient); onLibraryChanged(data, apiClient);
}); });
events.on(serverNotifications, 'PackageInstallationCompleted', function (e, apiClient, data) { Events.on(serverNotifications, 'PackageInstallationCompleted', function (e, apiClient, data) {
showPackageInstallNotification(apiClient, data, 'completed'); showPackageInstallNotification(apiClient, data, 'completed');
}); });
events.on(serverNotifications, 'PackageInstallationFailed', function (e, apiClient, data) { Events.on(serverNotifications, 'PackageInstallationFailed', function (e, apiClient, data) {
showPackageInstallNotification(apiClient, data, 'failed'); showPackageInstallNotification(apiClient, data, 'failed');
}); });
events.on(serverNotifications, 'PackageInstallationCancelled', function (e, apiClient, data) { Events.on(serverNotifications, 'PackageInstallationCancelled', function (e, apiClient, data) {
showPackageInstallNotification(apiClient, data, 'cancelled'); showPackageInstallNotification(apiClient, data, 'cancelled');
}); });
events.on(serverNotifications, 'PackageInstalling', function (e, apiClient, data) { Events.on(serverNotifications, 'PackageInstalling', function (e, apiClient, data) {
showPackageInstallNotification(apiClient, data, 'progress'); showPackageInstallNotification(apiClient, data, 'progress');
}); });
events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) { Events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, data) {
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
const notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,
@ -228,7 +228,7 @@ events.on(serverNotifications, 'ServerShuttingDown', function (e, apiClient, dat
showNotification(notification, 0, apiClient); showNotification(notification, 0, apiClient);
}); });
events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) { Events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data) {
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
const notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,
@ -237,7 +237,7 @@ events.on(serverNotifications, 'ServerRestarting', function (e, apiClient, data)
showNotification(notification, 0, apiClient); showNotification(notification, 0, apiClient);
}); });
events.on(serverNotifications, 'RestartRequired', function (e, apiClient) { Events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
const notification = { const notification = {
tag: 'restart' + serverId, tag: 'restart' + serverId,

143
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -1,15 +1,21 @@
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import browser from 'browser'; import browser from '../../scripts/browser';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from '../playback/nowplayinghelper';
import appHost from 'apphost'; import { appHost } from '../apphost';
import dom from 'dom'; import dom from '../../scripts/dom';
import itemContextMenu from 'itemContextMenu'; import itemContextMenu from '../itemContextMenu';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-ratingbutton'; import '../../elements/emby-ratingbutton/emby-ratingbutton';
import ServerConnections from '../ServerConnections';
import appFooter from '../appFooter/appFooter';
import itemShortcuts from '../shortcuts';
import './nowPlayingBar.css';
import '../../elements/emby-slider/emby-slider';
import { appRouter } from '../appRouter';
/* eslint-disable indent */ /* eslint-disable indent */
@ -243,52 +249,42 @@ import 'emby-ratingbutton';
} }
function showRemoteControl() { function showRemoteControl() {
import('appRouter').then(({default: appRouter}) => { appRouter.showNowPlaying();
appRouter.showNowPlaying();
});
} }
let nowPlayingBarElement; let nowPlayingBarElement;
function getNowPlayingBar() { function getNowPlayingBar() {
if (nowPlayingBarElement) { if (nowPlayingBarElement) {
return Promise.resolve(nowPlayingBarElement); return nowPlayingBarElement;
} }
return new Promise(function (resolve, reject) { const parentContainer = appFooter.element;
Promise.all([ nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');
import('appFooter-shared'),
import('itemShortcuts'),
import('css!./nowPlayingBar.css'),
import('emby-slider')
])
.then(([appfooter, itemShortcuts]) => {
const parentContainer = appfooter.element;
nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');
if (nowPlayingBarElement) { if (nowPlayingBarElement) {
resolve(nowPlayingBarElement); return nowPlayingBarElement;
return; }
}
parentContainer.insertAdjacentHTML('afterbegin', getNowPlayingBarHtml()); parentContainer.insertAdjacentHTML('afterbegin', getNowPlayingBarHtml());
nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar'); window.CustomElements.upgradeSubtree(parentContainer);
if (layoutManager.mobile) { nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');
hideButton(nowPlayingBarElement.querySelector('.btnShuffleQueue'));
hideButton(nowPlayingBarElement.querySelector('.nowPlayingBarCenter'));
}
if (browser.safari && browser.slow) { if (layoutManager.mobile) {
// Not handled well here. The wrong elements receive events, bar doesn't update quickly enough, etc. hideButton(nowPlayingBarElement.querySelector('.btnShuffleQueue'));
nowPlayingBarElement.classList.add('noMediaProgress'); hideButton(nowPlayingBarElement.querySelector('.nowPlayingBarCenter'));
} }
itemShortcuts.on(nowPlayingBarElement); if (browser.safari && browser.slow) {
// Not handled well here. The wrong elements receive events, bar doesn't update quickly enough, etc.
nowPlayingBarElement.classList.add('noMediaProgress');
}
bindEvents(nowPlayingBarElement); itemShortcuts.on(nowPlayingBarElement);
resolve(nowPlayingBarElement);
}); bindEvents(nowPlayingBarElement);
});
return nowPlayingBarElement;
} }
function showButton(button) { function showButton(button) {
@ -451,7 +447,7 @@ import 'emby-ratingbutton';
if (item.SeriesPrimaryImageTag) { if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
} }
@ -459,12 +455,12 @@ import 'emby-ratingbutton';
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (item.ParentThumbImageTag) { if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -481,12 +477,12 @@ import 'emby-ratingbutton';
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
} }
if (item.AlbumId && item.AlbumPrimaryImageTag) { if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;
@ -547,7 +543,7 @@ import 'emby-ratingbutton';
if (nowPlayingItem.Id) { if (nowPlayingItem.Id) {
if (isRefreshing) { if (isRefreshing) {
const apiClient = window.connectionManager.getApiClient(nowPlayingItem.ServerId); const apiClient = ServerConnections.getApiClient(nowPlayingItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
const userData = item.UserData || {}; const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes; const likes = userData.Likes == null ? '' : userData.Likes;
@ -620,7 +616,7 @@ import 'emby-ratingbutton';
return; return;
} }
getNowPlayingBar().then(slideUp); slideUp(getNowPlayingBar());
} }
function hideNowPlayingBar() { function hideNowPlayingBar() {
@ -681,9 +677,8 @@ import 'emby-ratingbutton';
return; return;
} }
getNowPlayingBar().then(function () { getNowPlayingBar();
updatePlayerStateInternal(event, state, player); updatePlayerStateInternal(event, state, player);
});
} }
function onTimeUpdate(e) { function onTimeUpdate(e) {
@ -707,15 +702,15 @@ import 'emby-ratingbutton';
const player = currentPlayer; const player = currentPlayer;
if (player) { if (player) {
events.off(player, 'playbackstart', onPlaybackStart); Events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'statechange', onPlaybackStart); Events.off(player, 'statechange', onPlaybackStart);
events.off(player, 'repeatmodechange', onRepeatModeChange); Events.off(player, 'repeatmodechange', onRepeatModeChange);
events.off(player, 'shufflequeuemodechange', onQueueShuffleModeChange); Events.off(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
events.off(player, 'playbackstop', onPlaybackStopped); Events.off(player, 'playbackstop', onPlaybackStopped);
events.off(player, 'volumechange', onVolumeChanged); Events.off(player, 'volumechange', onVolumeChanged);
events.off(player, 'pause', onPlayPauseStateChanged); Events.off(player, 'pause', onPlayPauseStateChanged);
events.off(player, 'unpause', onPlayPauseStateChanged); Events.off(player, 'unpause', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate); Events.off(player, 'timeupdate', onTimeUpdate);
currentPlayer = null; currentPlayer = null;
hideNowPlayingBar(); hideNowPlayingBar();
@ -753,18 +748,18 @@ import 'emby-ratingbutton';
refreshFromPlayer(player); refreshFromPlayer(player);
events.on(player, 'playbackstart', onPlaybackStart); Events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'statechange', onPlaybackStart); Events.on(player, 'statechange', onPlaybackStart);
events.on(player, 'repeatmodechange', onRepeatModeChange); Events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shufflequeuemodechange', onQueueShuffleModeChange); Events.on(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
events.on(player, 'playbackstop', onPlaybackStopped); Events.on(player, 'playbackstop', onPlaybackStopped);
events.on(player, 'volumechange', onVolumeChanged); Events.on(player, 'volumechange', onVolumeChanged);
events.on(player, 'pause', onPlayPauseStateChanged); Events.on(player, 'pause', onPlayPauseStateChanged);
events.on(player, 'unpause', onPlayPauseStateChanged); Events.on(player, 'unpause', onPlayPauseStateChanged);
events.on(player, 'timeupdate', onTimeUpdate); Events.on(player, 'timeupdate', onTimeUpdate);
} }
events.on(playbackManager, 'playerchange', function () { Events.on(playbackManager, 'playerchange', function () {
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

4
src/components/packageManager.js
View file

@ -1,5 +1,5 @@
import appSettings from 'appSettings'; import appSettings from '../scripts/settings/appSettings';
import pluginManager from 'pluginManager'; import { pluginManager } from './pluginManager';
/* eslint-disable indent */ /* eslint-disable indent */
class PackageManager { class PackageManager {

22
src/components/playback/brightnessosd.js
View file

@ -1,9 +1,9 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import playbackManager from 'playbackManager'; import { playbackManager } from './playbackmanager';
import dom from 'dom'; import dom from '../../scripts/dom';
import browser from 'browser'; import browser from '../../scripts/browser';
import 'css!./iconosd'; import './iconosd.css';
import 'material-icons'; import 'material-design-icons-iconfont';
let currentPlayer; let currentPlayer;
let osdElement; let osdElement;
@ -121,8 +121,8 @@ function releaseCurrentPlayer() {
const player = currentPlayer; const player = currentPlayer;
if (player) { if (player) {
events.off(player, 'brightnesschange', onBrightnessChanged); Events.off(player, 'brightnesschange', onBrightnessChanged);
events.off(player, 'playbackstop', hideOsd); Events.off(player, 'playbackstop', hideOsd);
currentPlayer = null; currentPlayer = null;
} }
} }
@ -151,11 +151,11 @@ function bindToPlayer(player) {
} }
hideOsd(); hideOsd();
events.on(player, 'brightnesschange', onBrightnessChanged); Events.on(player, 'brightnesschange', onBrightnessChanged);
events.on(player, 'playbackstop', hideOsd); Events.on(player, 'playbackstop', hideOsd);
} }
events.on(playbackManager, 'playerchange', function () { Events.on(playbackManager, 'playerchange', function () {
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

46
src/components/playback/mediasession.js
View file

@ -1,7 +1,9 @@
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from '../playback/nowplayinghelper';
import shell from 'shell'; import { Events } from 'jellyfin-apiclient';
import events from 'events'; import ServerConnections from '../ServerConnections';
import shell from '../../scripts/shell';
/* eslint-disable indent */ /* eslint-disable indent */
// Reports media playback to the device for lock screen control // Reports media playback to the device for lock screen control
@ -16,16 +18,16 @@ import events from 'events';
} else if (options.type === 'Primary' && item.SeriesPrimaryImageTag) { } else if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (options.type === 'Thumb') { } else if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (item.ParentThumbImageTag) { } else if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -38,11 +40,11 @@ import events from 'events';
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);
} else if (item.AlbumId && item.AlbumPrimaryImageTag) { } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;
@ -164,12 +166,12 @@ import events from 'events';
function releaseCurrentPlayer() { function releaseCurrentPlayer() {
if (currentPlayer) { if (currentPlayer) {
events.off(currentPlayer, 'playbackstart', onPlaybackStart); Events.off(currentPlayer, 'playbackstart', onPlaybackStart);
events.off(currentPlayer, 'playbackstop', onPlaybackStopped); Events.off(currentPlayer, 'playbackstop', onPlaybackStopped);
events.off(currentPlayer, 'unpause', onGeneralEvent); Events.off(currentPlayer, 'unpause', onGeneralEvent);
events.off(currentPlayer, 'pause', onGeneralEvent); Events.off(currentPlayer, 'pause', onGeneralEvent);
events.off(currentPlayer, 'statechange', onStateChanged); Events.off(currentPlayer, 'statechange', onStateChanged);
events.off(currentPlayer, 'timeupdate', onGeneralEvent); Events.off(currentPlayer, 'timeupdate', onGeneralEvent);
currentPlayer = null; currentPlayer = null;
@ -198,12 +200,12 @@ import events from 'events';
const state = playbackManager.getPlayerState(player); const state = playbackManager.getPlayerState(player);
updatePlayerState(player, state, 'init'); updatePlayerState(player, state, 'init');
events.on(currentPlayer, 'playbackstart', onPlaybackStart); Events.on(currentPlayer, 'playbackstart', onPlaybackStart);
events.on(currentPlayer, 'playbackstop', onPlaybackStopped); Events.on(currentPlayer, 'playbackstop', onPlaybackStopped);
events.on(currentPlayer, 'unpause', onGeneralEvent); Events.on(currentPlayer, 'unpause', onGeneralEvent);
events.on(currentPlayer, 'pause', onGeneralEvent); Events.on(currentPlayer, 'pause', onGeneralEvent);
events.on(currentPlayer, 'statechange', onStateChanged); Events.on(currentPlayer, 'statechange', onStateChanged);
events.on(currentPlayer, 'timeupdate', onGeneralEvent); Events.on(currentPlayer, 'timeupdate', onGeneralEvent);
} }
function execute(name) { function execute(name) {
@ -251,7 +253,7 @@ import events from 'events';
}); });
} }
events.on(playbackManager, 'playerchange', function () { Events.on(playbackManager, 'playerchange', function () {
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

216
src/components/playback/playbackmanager.js
View file

@ -1,14 +1,16 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import appSettings from 'appSettings'; import appSettings from '../../scripts/settings/appSettings';
import itemHelper from 'itemHelper'; import itemHelper from '../itemHelper';
import pluginManager from 'pluginManager'; import { pluginManager } from '../pluginManager';
import PlayQueueManager from 'playQueueManager'; import PlayQueueManager from './playqueuemanager';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import loading from '../loading/loading';
import appHost from 'apphost'; import { appHost } from '../apphost';
import screenfull from 'screenfull'; import * as Screenfull from 'screenfull';
import ServerConnections from '../ServerConnections';
import alert from '../alert';
function enableLocalPlaylistManagement(player) { function enableLocalPlaylistManagement(player) {
if (player.getPlaylist) { if (player.getPlaylist) {
@ -23,14 +25,14 @@ function enableLocalPlaylistManagement(player) {
} }
function bindToFullscreenChange(player) { function bindToFullscreenChange(player) {
if (screenfull.isEnabled) { if (Screenfull.isEnabled) {
screenfull.on('change', function () { Screenfull.on('change', function () {
events.trigger(player, 'fullscreenchange'); Events.trigger(player, 'fullscreenchange');
}); });
} else { } else {
// iOS Safari // iOS Safari
document.addEventListener('webkitfullscreenchange', function () { document.addEventListener('webkitfullscreenchange', function () {
events.trigger(player, 'fullscreenchange'); Events.trigger(player, 'fullscreenchange');
}, false); }, false);
} }
} }
@ -46,14 +48,14 @@ function triggerPlayerChange(playbackManagerInstance, newPlayer, newTarget, prev
} }
} }
events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]); Events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]);
} }
function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) { function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) {
if (!serverId) { if (!serverId) {
// Not a server item // Not a server item
// We can expand on this later and possibly report them // We can expand on this later and possibly report them
events.trigger(playbackManagerInstance, 'reportplayback', [false]); Events.trigger(playbackManagerInstance, 'reportplayback', [false]);
return; return;
} }
@ -68,11 +70,11 @@ function reportPlayback(playbackManagerInstance, state, player, reportPlaylist,
addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId); addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
} }
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const reportPlaybackPromise = apiClient[method](info); const reportPlaybackPromise = apiClient[method](info);
// Notify that report has been sent // Notify that report has been sent
reportPlaybackPromise.then(() => { reportPlaybackPromise.then(() => {
events.trigger(playbackManagerInstance, 'reportplayback', [true]); Events.trigger(playbackManagerInstance, 'reportplayback', [true]);
}); });
} }
@ -105,7 +107,7 @@ function normalizeName(t) {
} }
function getItemsForPlayback(serverId, query) { function getItemsForPlayback(serverId, query) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
if (query.Ids && query.Ids.split(',').length === 1) { if (query.Ids && query.Ids.split(',').length === 1) {
const itemId = query.Ids.split(','); const itemId = query.Ids.split(',');
@ -619,7 +621,7 @@ function supportsDirectPlay(apiClient, item, mediaSource) {
} else if (mediaSource.Protocol === 'File') { } else if (mediaSource.Protocol === 'File') {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
// Determine if the file can be accessed directly // Determine if the file can be accessed directly
import('filesystem').then((filesystem) => { import('../../scripts/filesystem').then((filesystem) => {
const method = isFolderRip ? const method = isFolderRip ?
'directoryExists' : 'directoryExists' :
'fileExists'; 'fileExists';
@ -647,11 +649,9 @@ function validatePlaybackInfoResult(instance, result) {
} }
function showPlaybackInfoErrorMessage(instance, errorCode) { function showPlaybackInfoErrorMessage(instance, errorCode) {
import('alert').then(({ default: alert }) => { alert({
alert({ text: globalize.translate(errorCode),
text: globalize.translate(errorCode), title: globalize.translate('HeaderPlaybackError')
title: globalize.translate('HeaderPlaybackError')
});
}); });
} }
@ -852,13 +852,13 @@ class PlaybackManager {
player.tryPair(targetInfo) : player.tryPair(targetInfo) :
Promise.resolve(); Promise.resolve();
events.trigger(self, 'pairing'); Events.trigger(self, 'pairing');
promise.then(function () { promise.then(function () {
events.trigger(self, 'paired'); Events.trigger(self, 'paired');
setCurrentPlayerInternal(player, targetInfo); setCurrentPlayerInternal(player, targetInfo);
}, function () { }, function () {
events.trigger(self, 'pairerror'); Events.trigger(self, 'pairerror');
if (currentPairingId === targetInfo.id) { if (currentPairingId === targetInfo.id) {
currentPairingId = null; currentPairingId = null;
} }
@ -869,7 +869,7 @@ class PlaybackManager {
const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets); const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
return Promise.all(promises).then(function (responses) { return Promise.all(promises).then(function (responses) {
return window.connectionManager.currentApiClient().getCurrentUser().then(function (user) { return ServerConnections.currentApiClient().getCurrentUser().then(function (user) {
const targets = []; const targets = [];
targets.push({ targets.push({
@ -1161,7 +1161,7 @@ class PlaybackManager {
if (!brightnessOsdLoaded) { if (!brightnessOsdLoaded) {
brightnessOsdLoaded = true; brightnessOsdLoaded = true;
// TODO: Have this trigger an event instead to get the osd out of here // TODO: Have this trigger an event instead to get the osd out of here
import('brightnessOsd').then(); import('./brightnessosd').then();
} }
player.setBrightness(val); player.setBrightness(val);
} }
@ -1367,7 +1367,7 @@ class PlaybackManager {
function getSavedMaxStreamingBitrate(apiClient, mediaType) { function getSavedMaxStreamingBitrate(apiClient, mediaType) {
if (!apiClient) { if (!apiClient) {
// This should hopefully never happen // This should hopefully never happen
apiClient = window.connectionManager.currentApiClient(); apiClient = ServerConnections.currentApiClient();
} }
const endpointInfo = apiClient.getSavedEndpointInfo() || {}; const endpointInfo = apiClient.getSavedEndpointInfo() || {};
@ -1390,7 +1390,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null; const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player); const currentItem = self.currentItem(player);
const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient(); const apiClient = currentItem ? ServerConnections.getApiClient(currentItem.ServerId) : ServerConnections.currentApiClient();
return getSavedMaxStreamingBitrate(apiClient, mediaType); return getSavedMaxStreamingBitrate(apiClient, mediaType);
}; };
@ -1404,7 +1404,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null; const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player); const currentItem = self.currentItem(player);
const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient(); const apiClient = currentItem ? ServerConnections.getApiClient(currentItem.ServerId) : ServerConnections.currentApiClient();
const endpointInfo = apiClient.getSavedEndpointInfo() || {}; const endpointInfo = apiClient.getSavedEndpointInfo() || {};
return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType); return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType);
@ -1416,7 +1416,7 @@ class PlaybackManager {
return player.setMaxStreamingBitrate(options); return player.setMaxStreamingBitrate(options);
} }
const apiClient = window.connectionManager.getApiClient(self.currentItem(player).ServerId); const apiClient = ServerConnections.getApiClient(self.currentItem(player).ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) { apiClient.getEndpointInfo().then(function (endpointInfo) {
const playerData = getPlayerData(player); const playerData = getPlayerData(player);
@ -1447,12 +1447,12 @@ class PlaybackManager {
return player.isFullscreen(); return player.isFullscreen();
} }
if (!screenfull.isEnabled) { if (!Screenfull.isEnabled) {
// iOS Safari // iOS Safari
return document.webkitIsFullScreen; return document.webkitIsFullScreen;
} }
return screenfull.isFullscreen; return Screenfull.isFullscreen;
}; };
self.toggleFullscreen = function (player) { self.toggleFullscreen = function (player) {
@ -1461,8 +1461,8 @@ class PlaybackManager {
return player.toggleFullscreen(); return player.toggleFullscreen();
} }
if (screenfull.isEnabled) { if (Screenfull.isEnabled) {
screenfull.toggle(); Screenfull.toggle();
} else { } else {
// iOS Safari // iOS Safari
if (document.webkitIsFullScreen && document.webkitCancelFullscreen) { if (document.webkitIsFullScreen && document.webkitCancelFullscreen) {
@ -1678,7 +1678,7 @@ class PlaybackManager {
const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex; const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
let currentMediaSource = self.currentMediaSource(player); let currentMediaSource = self.currentMediaSource(player);
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
if (ticks) { if (ticks) {
ticks = parseInt(ticks); ticks = parseInt(ticks);
@ -1834,7 +1834,7 @@ class PlaybackManager {
}, queryOptions)); }, queryOptions));
} else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) { } else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
promise = new Promise(function (resolve, reject) { promise = new Promise(function (resolve, reject) {
const apiClient = window.connectionManager.getApiClient(firstItem.ServerId); const apiClient = ServerConnections.getApiClient(firstItem.ServerId);
apiClient.getCurrentUser().then(function (user) { apiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) { if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
@ -2065,7 +2065,7 @@ class PlaybackManager {
return playOther(items, options, user); return playOther(items, options, user);
} }
const apiClient = window.connectionManager.getApiClient(firstItem.ServerId); const apiClient = ServerConnections.getApiClient(firstItem.ServerId);
return getIntros(firstItem, apiClient, options).then(function (introsResult) { return getIntros(firstItem, apiClient, options).then(function (introsResult) {
const introItems = introsResult.Items; const introItems = introsResult.Items;
@ -2128,14 +2128,14 @@ class PlaybackManager {
const mediaType = item.MediaType; const mediaType = item.MediaType;
const onBitrateDetectionFailure = function () { const onBitrateDetectionFailure = function () {
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn); return playAfterBitrateDetect(getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn);
}; };
if (!isServerItem(item) || itemHelper.isLocalItem(item)) { if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return onBitrateDetectionFailure(); return onBitrateDetectionFailure();
} }
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) { apiClient.getEndpointInfo().then(function (endpointInfo) {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) { if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then(function (bitrate) { return apiClient.detectBitrate().then(function (bitrate) {
@ -2158,7 +2158,7 @@ class PlaybackManager {
removeCurrentPlayer(player); removeCurrentPlayer(player);
} }
events.trigger(self, 'playbackcancelled'); Events.trigger(self, 'playbackcancelled');
return Promise.reject(); return Promise.reject();
} }
@ -2254,7 +2254,7 @@ class PlaybackManager {
return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) { return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) {
const deviceProfile = responses[1]; const deviceProfile = responses[1];
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
const mediaSourceId = playOptions.mediaSourceId; const mediaSourceId = playOptions.mediaSourceId;
const audioStreamIndex = playOptions.audioStreamIndex; const audioStreamIndex = playOptions.audioStreamIndex;
@ -2299,11 +2299,11 @@ class PlaybackManager {
const startPosition = options.startPositionTicks || 0; const startPosition = options.startPositionTicks || 0;
const mediaType = options.mediaType || item.MediaType; const mediaType = options.mediaType || item.MediaType;
const player = getPlayer(item, options); const player = getPlayer(item, options);
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () { return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType); const maxBitrate = getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) { return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) { return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
@ -2319,11 +2319,11 @@ class PlaybackManager {
const mediaType = options.mediaType || item.MediaType; const mediaType = options.mediaType || item.MediaType;
// TODO: Remove the true forceLocalPlayer hack // TODO: Remove the true forceLocalPlayer hack
const player = getPlayer(item, options, true); const player = getPlayer(item, options, true);
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () { return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType); const maxBitrate = getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) { return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) { return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
@ -2548,7 +2548,7 @@ class PlaybackManager {
const isCurrentIndex = removeResult.isCurrentIndex; const isCurrentIndex = removeResult.isCurrentIndex;
events.trigger(player, 'playlistitemremove', [ Events.trigger(player, 'playlistitemremove', [
{ {
playlistItemIds: playlistItemIds playlistItemIds: playlistItemIds
} }
@ -2573,7 +2573,7 @@ class PlaybackManager {
return; return;
} }
events.trigger(player, 'playlistitemmove', [ Events.trigger(player, 'playlistitemmove', [
{ {
playlistItemId: moveResult.playlistItemId, playlistItemId: moveResult.playlistItemId,
newIndex: moveResult.newIndex newIndex: moveResult.newIndex
@ -2707,7 +2707,7 @@ class PlaybackManager {
const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player); const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
if (queueDirectToPlayer) { if (queueDirectToPlayer) {
const apiClient = window.connectionManager.getApiClient(items[0].ServerId); const apiClient = ServerConnections.getApiClient(items[0].ServerId);
player.getDeviceProfile(items[0]).then(function (profile) { player.getDeviceProfile(items[0]).then(function (profile) {
setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () { setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () {
@ -2727,7 +2727,7 @@ class PlaybackManager {
} else { } else {
self._playQueueManager.queue(items); self._playQueueManager.queue(items);
} }
events.trigger(player, 'playlistitemadd'); Events.trigger(player, 'playlistitemadd');
} }
function onPlayerProgressInterval() { function onPlayerProgressInterval() {
@ -2779,8 +2779,8 @@ class PlaybackManager {
state.IsFirstItem = isFirstItem; state.IsFirstItem = isFirstItem;
state.IsFullscreen = fullscreen; state.IsFullscreen = fullscreen;
events.trigger(player, 'playbackstart', [state]); Events.trigger(player, 'playbackstart', [state]);
events.trigger(self, 'playbackstart', [player, state]); Events.trigger(self, 'playbackstart', [player, state]);
// only used internally as a safeguard to avoid reporting other events to the server before playback start // only used internally as a safeguard to avoid reporting other events to the server before playback start
streamInfo.started = true; streamInfo.started = true;
@ -2810,8 +2810,8 @@ class PlaybackManager {
state.IsFirstItem = isFirstItem; state.IsFirstItem = isFirstItem;
state.IsFullscreen = fullscreen; state.IsFullscreen = fullscreen;
events.trigger(player, 'playbackstart', [state]); Events.trigger(player, 'playbackstart', [state]);
events.trigger(self, 'playbackstart', [player, state]); Events.trigger(self, 'playbackstart', [player, state]);
// only used internally as a safeguard to avoid reporting other events to the server before playback start // only used internally as a safeguard to avoid reporting other events to the server before playback start
streamInfo.started = true; streamInfo.started = true;
@ -2850,8 +2850,8 @@ class PlaybackManager {
state.NextItem = playbackStopInfo.nextItem; state.NextItem = playbackStopInfo.nextItem;
events.trigger(player, 'playbackstop', [state]); Events.trigger(player, 'playbackstop', [state]);
events.trigger(self, 'playbackstop', [playbackStopInfo]); Events.trigger(self, 'playbackstop', [playbackStopInfo]);
const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions(); const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null; const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
@ -2952,8 +2952,8 @@ class PlaybackManager {
self._playQueueManager.reset(); self._playQueueManager.reset();
} }
events.trigger(player, 'playbackstop', [state]); Events.trigger(player, 'playbackstop', [state]);
events.trigger(self, 'playbackstop', [playbackStopInfo]); Events.trigger(self, 'playbackstop', [playbackStopInfo]);
const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions(); const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null; const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
@ -2999,7 +2999,7 @@ class PlaybackManager {
reportPlayback(self, state, activePlayer, true, serverId, 'reportPlaybackStopped'); reportPlayback(self, state, activePlayer, true, serverId, 'reportPlaybackStopped');
} }
events.trigger(self, 'playbackstop', [{ Events.trigger(self, 'playbackstop', [{
player: activePlayer, player: activePlayer,
state: state, state: state,
nextItem: newItem, nextItem: newItem,
@ -3010,8 +3010,8 @@ class PlaybackManager {
function bindStopped(player) { function bindStopped(player) {
if (enableLocalPlaylistManagement(player)) { if (enableLocalPlaylistManagement(player)) {
events.off(player, 'stopped', onPlaybackStopped); Events.off(player, 'stopped', onPlaybackStopped);
events.on(player, 'stopped', onPlaybackStopped); Events.on(player, 'stopped', onPlaybackStopped);
} }
} }
@ -3061,7 +3061,7 @@ class PlaybackManager {
} }
function unbindStopped(player) { function unbindStopped(player) {
events.off(player, 'stopped', onPlaybackStopped); Events.off(player, 'stopped', onPlaybackStopped);
} }
function initLegacyVolumeMethods(player) { function initLegacyVolumeMethods(player) {
@ -3090,28 +3090,28 @@ class PlaybackManager {
} }
if (enableLocalPlaylistManagement(player)) { if (enableLocalPlaylistManagement(player)) {
events.on(player, 'error', onPlaybackError); Events.on(player, 'error', onPlaybackError);
events.on(player, 'timeupdate', onPlaybackTimeUpdate); Events.on(player, 'timeupdate', onPlaybackTimeUpdate);
events.on(player, 'pause', onPlaybackPause); Events.on(player, 'pause', onPlaybackPause);
events.on(player, 'unpause', onPlaybackUnpause); Events.on(player, 'unpause', onPlaybackUnpause);
events.on(player, 'volumechange', onPlaybackVolumeChange); Events.on(player, 'volumechange', onPlaybackVolumeChange);
events.on(player, 'repeatmodechange', onRepeatModeChange); Events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange); Events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemmove', onPlaylistItemMove); Events.on(player, 'playlistitemmove', onPlaylistItemMove);
events.on(player, 'playlistitemremove', onPlaylistItemRemove); Events.on(player, 'playlistitemremove', onPlaylistItemRemove);
events.on(player, 'playlistitemadd', onPlaylistItemAdd); Events.on(player, 'playlistitemadd', onPlaylistItemAdd);
} else if (player.isLocalPlayer) { } else if (player.isLocalPlayer) {
events.on(player, 'itemstarted', onPlaybackStartedFromSelfManagingPlayer); Events.on(player, 'itemstarted', onPlaybackStartedFromSelfManagingPlayer);
events.on(player, 'itemstopped', onPlaybackStoppedFromSelfManagingPlayer); Events.on(player, 'itemstopped', onPlaybackStoppedFromSelfManagingPlayer);
events.on(player, 'timeupdate', onPlaybackTimeUpdate); Events.on(player, 'timeupdate', onPlaybackTimeUpdate);
events.on(player, 'pause', onPlaybackPause); Events.on(player, 'pause', onPlaybackPause);
events.on(player, 'unpause', onPlaybackUnpause); Events.on(player, 'unpause', onPlaybackUnpause);
events.on(player, 'volumechange', onPlaybackVolumeChange); Events.on(player, 'volumechange', onPlaybackVolumeChange);
events.on(player, 'repeatmodechange', onRepeatModeChange); Events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange); Events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemmove', onPlaylistItemMove); Events.on(player, 'playlistitemmove', onPlaylistItemMove);
events.on(player, 'playlistitemremove', onPlaylistItemRemove); Events.on(player, 'playlistitemremove', onPlaylistItemRemove);
events.on(player, 'playlistitemadd', onPlaylistItemAdd); Events.on(player, 'playlistitemadd', onPlaylistItemAdd);
} }
if (player.isLocalPlayer) { if (player.isLocalPlayer) {
@ -3120,13 +3120,13 @@ class PlaybackManager {
bindStopped(player); bindStopped(player);
} }
events.on(pluginManager, 'registered', function (e, plugin) { Events.on(pluginManager, 'registered', function (e, plugin) {
if (plugin.type === 'mediaplayer') { if (plugin.type === 'mediaplayer') {
initMediaPlayer(plugin); initMediaPlayer(plugin);
} }
}); });
pluginManager.ofType('mediaplayer').map(initMediaPlayer); pluginManager.ofType('mediaplayer').forEach(initMediaPlayer);
function sendProgressUpdate(player, progressEventName, reportPlaylist) { function sendProgressUpdate(player, progressEventName, reportPlaylist) {
if (!player) { if (!player) {
@ -3157,15 +3157,15 @@ class PlaybackManager {
streamInfo.lastMediaInfoQuery = new Date().getTime(); streamInfo.lastMediaInfoQuery = new Date().getTime();
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
if (!apiClient.isMinServerVersion('3.2.70.7')) { if (!apiClient.isMinServerVersion('3.2.70.7')) {
return; return;
} }
window.connectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) { ServerConnections.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) {
mediaSource.MediaStreams = info.MediaStreams; mediaSource.MediaStreams = info.MediaStreams;
events.trigger(player, 'mediastreamschange'); Events.trigger(player, 'mediastreamschange');
}, function () { }, function () {
}); });
} }
@ -3190,9 +3190,9 @@ class PlaybackManager {
}; };
if (appHost.supports('remotecontrol')) { if (appHost.supports('remotecontrol')) {
import('serverNotifications').then(({ default: serverNotifications }) => { import('../../scripts/serverNotifications').then(({ default: serverNotifications }) => {
events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self)); Events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self)); Events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
}); });
} }
} }
@ -3220,7 +3220,7 @@ class PlaybackManager {
return Promise.reject(); return Promise.reject();
} }
const apiClient = window.connectionManager.getApiClient(nextItem.item.ServerId); const apiClient = ServerConnections.getApiClient(nextItem.item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id); return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id);
} }
@ -3361,7 +3361,7 @@ class PlaybackManager {
return player.playTrailers(item); return player.playTrailers(item);
} }
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
const instance = this; const instance = this;
@ -3393,7 +3393,7 @@ class PlaybackManager {
} }
getSubtitleUrl(textStream, serverId) { getSubtitleUrl(textStream, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl; return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
} }
@ -3473,7 +3473,7 @@ class PlaybackManager {
return player.instantMix(item); return player.instantMix(item);
} }
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
const options = {}; const options = {};
options.UserId = apiClient.getCurrentUserId(); options.UserId = apiClient.getCurrentUserId();
@ -3588,7 +3588,7 @@ class PlaybackManager {
} }
this._playQueueManager.setRepeatMode(value); this._playQueueManager.setRepeatMode(value);
events.trigger(player, 'repeatmodechange'); Events.trigger(player, 'repeatmodechange');
} }
getRepeatMode(player = this._currentPlayer) { getRepeatMode(player = this._currentPlayer) {
@ -3605,7 +3605,7 @@ class PlaybackManager {
} }
this._playQueueManager.setShuffleMode(value); this._playQueueManager.setShuffleMode(value);
events.trigger(player, 'shufflequeuemodechange'); Events.trigger(player, 'shufflequeuemodechange');
} }
getQueueShuffleMode(player = this._currentPlayer) { getQueueShuffleMode(player = this._currentPlayer) {
@ -3633,7 +3633,7 @@ class PlaybackManager {
} else { } else {
this._playQueueManager.toggleShuffleMode(); this._playQueueManager.toggleShuffleMode();
} }
events.trigger(player, 'shufflequeuemodechange'); Events.trigger(player, 'shufflequeuemodechange');
} }
clearQueue(clearCurrentItem = false, player = this._currentPlayer) { clearQueue(clearCurrentItem = false, player = this._currentPlayer) {
@ -3642,7 +3642,7 @@ class PlaybackManager {
} }
this._playQueueManager.clearPlaylist(clearCurrentItem); this._playQueueManager.clearPlaylist(clearCurrentItem);
events.trigger(player, 'playlistitemremove'); Events.trigger(player, 'playlistitemremove');
} }
trySetActiveDeviceName(name) { trySetActiveDeviceName(name) {
@ -3757,4 +3757,12 @@ class PlaybackManager {
} }
} }
export default new PlaybackManager(); export const playbackManager = new PlaybackManager();
window.addEventListener('beforeunload', function () {
try {
playbackManager.onAppClose();
} catch (err) {
console.error('error in onAppClose: ' + err);
}
});

11
src/components/playback/playbackorientation.js
View file

@ -1,6 +1,7 @@
import playbackManager from 'playbackManager';
import layoutManager from 'layoutManager'; import { playbackManager } from './playbackmanager';
import events from 'events'; import layoutManager from '../layoutManager';
import { Events } from 'jellyfin-apiclient';
let orientationLocked; let orientationLocked;
@ -13,7 +14,7 @@ function onOrientationChangeError(err) {
console.error('error locking orientation: ' + err); console.error('error locking orientation: ' + err);
} }
events.on(playbackManager, 'playbackstart', function (e, player, state) { Events.on(playbackManager, 'playbackstart', function (e, player, state) {
const isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player); const isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player);
if (isLocalVideo && layoutManager.mobile) { if (isLocalVideo && layoutManager.mobile) {
@ -36,7 +37,7 @@ events.on(playbackManager, 'playbackstart', function (e, player, state) {
} }
}); });
events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) { Events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
if (orientationLocked && !playbackStopInfo.nextMediaType) { if (orientationLocked && !playbackStopInfo.nextMediaType) {
/* eslint-disable-next-line compat/compat */ /* eslint-disable-next-line compat/compat */
const unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation && window.screen.orientation.unlock); const unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation && window.screen.orientation.unlock);

99
src/components/playback/playerSelectionMenu.js
View file

@ -1,12 +1,16 @@
import appSettings from 'appSettings'; import appSettings from '../../scripts/settings/appSettings';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import browser from 'browser'; import browser from '../../scripts/browser';
import loading from 'loading'; import loading from '../loading/loading';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import appHost from 'apphost'; import { appHost } from '../apphost';
import * as autocast from 'autocast'; import { enable, isEnabled, supported } from '../../scripts/autocast';
import '../../elements/emby-checkbox/emby-checkbox';
import '../../elements/emby-button/emby-button';
import dialog from '../dialog/dialog';
import dialogHelper from '../dialogHelper/dialogHelper';
function mirrorItem(info, player) { function mirrorItem(info, player) {
const item = info.item; const item = info.item;
@ -108,7 +112,7 @@ export function show(button) {
}; };
}); });
import('actionsheet').then(({default: actionsheet}) => { import('../actionSheet/actionSheet').then((actionsheet) => {
loading.hide(); loading.hide();
const menuOptions = { const menuOptions = {
@ -140,54 +144,45 @@ export function show(button) {
} }
function showActivePlayerMenu(playerInfo) { function showActivePlayerMenu(playerInfo) {
Promise.all([ showActivePlayerMenuInternal(playerInfo);
import('dialogHelper'),
import('dialog'),
import('emby-checkbox'),
import('emby-button')
]).then(([dialogHelper]) => {
showActivePlayerMenuInternal(dialogHelper, playerInfo);
});
} }
function disconnectFromPlayer(currentDeviceName) { function disconnectFromPlayer(currentDeviceName) {
if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) { if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
import('dialog').then(({default: dialog}) => { const menuItems = [];
const menuItems = [];
menuItems.push({ menuItems.push({
name: globalize.translate('Yes'), name: globalize.translate('Yes'),
id: 'yes' id: 'yes'
}); });
menuItems.push({ menuItems.push({
name: globalize.translate('No'), name: globalize.translate('No'),
id: 'no' id: 'no'
}); });
dialog({ dialog.show({
buttons: menuItems, buttons: menuItems,
text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName) text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName)
}).then(function (id) { }).then(function (id) {
switch (id) { switch (id) {
case 'yes': case 'yes':
playbackManager.getCurrentPlayer().endSession(); playbackManager.getCurrentPlayer().endSession();
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();
break; break;
case 'no': case 'no':
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();
break; break;
default: default:
break; break;
} }
});
}); });
} else { } else {
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();
} }
} }
function showActivePlayerMenuInternal(dialogHelper, playerInfo) { function showActivePlayerMenuInternal(playerInfo) {
let html = ''; let html = '';
const dialogOptions = { const dialogOptions = {
@ -222,9 +217,9 @@ function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
html += '</div>'; html += '</div>';
if (autocast.supported()) { if (supported()) {
html += '<div><label class="checkboxContainer">'; html += '<div><label class="checkboxContainer">';
const checkedHtmlAC = autocast.isEnabled() ? ' checked' : ''; const checkedHtmlAC = isEnabled() ? ' checked' : '';
html += '<input type="checkbox" is="emby-checkbox" class="chkAutoCast"' + checkedHtmlAC + '/>'; html += '<input type="checkbox" is="emby-checkbox" class="chkAutoCast"' + checkedHtmlAC + '/>';
html += '<span>' + globalize.translate('EnableAutoCast') + '</span>'; html += '<span>' + globalize.translate('EnableAutoCast') + '</span>';
html += '</label></div>'; html += '</label></div>';
@ -285,7 +280,7 @@ function onMirrorChange() {
} }
function onAutoCastChange() { function onAutoCastChange() {
autocast.enable(this.checked); enable(this.checked);
} }
document.addEventListener('viewshow', function (e) { document.addEventListener('viewshow', function (e) {
@ -300,21 +295,21 @@ document.addEventListener('viewshow', function (e) {
} }
}); });
events.on(appSettings, 'change', function (e, name) { Events.on(appSettings, 'change', function (e, name) {
if (name === 'displaymirror') { if (name === 'displaymirror') {
mirrorIfEnabled(); mirrorIfEnabled();
} }
}); });
events.on(playbackManager, 'pairing', function (e) { Events.on(playbackManager, 'pairing', function (e) {
loading.show(); loading.show();
}); });
events.on(playbackManager, 'paired', function (e) { Events.on(playbackManager, 'paired', function (e) {
loading.hide(); loading.hide();
}); });
events.on(playbackManager, 'pairerror', function (e) { Events.on(playbackManager, 'pairerror', function (e) {
loading.hide(); loading.hide();
}); });

17
src/components/playback/playersettingsmenu.js
View file

@ -1,7 +1,8 @@
import actionsheet from 'actionsheet'; import actionsheet from '../actionSheet/actionSheet';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import qualityoptions from 'qualityoptions'; import qualityoptions from '../qualityOptions';
import ServerConnections from '../ServerConnections';
function showQualityMenu(player, btn) { function showQualityMenu(player, btn) {
const videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) { const videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
@ -32,18 +33,18 @@ function showQualityMenu(player, btn) {
return opt; return opt;
}); });
let selectedId = options.filter(function (o) { const selectedId = options.filter(function (o) {
return o.selected; return o.selected;
}); });
selectedId = selectedId.length ? selectedId[0].bitrate : null; const selectedBitrate = selectedId.length ? selectedId[0].bitrate : null;
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn
}).then(function (id) { }).then(function (id) {
const bitrate = parseInt(id); const bitrate = parseInt(id);
if (bitrate !== selectedId) { if (bitrate !== selectedBitrate) {
playbackManager.setMaxStreamingBitrate({ playbackManager.setMaxStreamingBitrate({
enableAutomaticBitrateDetection: bitrate ? false : true, enableAutomaticBitrateDetection: bitrate ? false : true,
maxBitrate: bitrate maxBitrate: bitrate
@ -250,7 +251,7 @@ export function show(options) {
return showWithUser(options, player, null); return showWithUser(options, player, null);
} }
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
return apiClient.getCurrentUser().then(function (user) { return apiClient.getCurrentUser().then(function (user) {
return showWithUser(options, player, user); return showWithUser(options, player, user);
}); });

4
src/components/playback/playmethodhelper.js
View file

@ -3,7 +3,9 @@ export function getDisplayPlayMethod(session) {
return null; return null;
} }
if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) { if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect && session.TranscodingInfo.IsAudioDirect) {
return 'Remux';
} else if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
return 'DirectStream'; return 'DirectStream';
} else if (session.PlayState.PlayMethod === 'Transcode') { } else if (session.PlayState.PlayMethod === 'Transcode') {
return 'Transcode'; return 'Transcode';

6
src/components/playback/remotecontrolautoplay.js
View file

@ -1,5 +1,5 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
function transferPlayback(oldPlayer, newPlayer) { function transferPlayback(oldPlayer, newPlayer) {
const state = playbackManager.getPlayerState(oldPlayer); const state = playbackManager.getPlayerState(oldPlayer);
@ -26,7 +26,7 @@ function transferPlayback(oldPlayer, newPlayer) {
}); });
} }
events.on(playbackManager, 'playerchange', (e, newPlayer, newTarget, oldPlayer) => { Events.on(playbackManager, 'playerchange', (e, newPlayer, newTarget, oldPlayer) => {
if (!oldPlayer || !newPlayer) { if (!oldPlayer || !newPlayer) {
return; return;
} }

23
src/components/playback/volumeosd.js
View file

@ -1,9 +1,10 @@
import events from 'events';
import playbackManager from 'playbackManager'; import { Events } from 'jellyfin-apiclient';
import dom from 'dom'; import { playbackManager } from './playbackmanager';
import browser from 'browser'; import dom from '../../scripts/dom';
import 'css!./iconosd'; import browser from '../../scripts/browser';
import 'material-icons'; import './iconosd.css';
import 'material-design-icons-iconfont';
let currentPlayer; let currentPlayer;
let osdElement; let osdElement;
@ -111,8 +112,8 @@ function releaseCurrentPlayer() {
const player = currentPlayer; const player = currentPlayer;
if (player) { if (player) {
events.off(player, 'volumechange', onVolumeChanged); Events.off(player, 'volumechange', onVolumeChanged);
events.off(player, 'playbackstop', hideOsd); Events.off(player, 'playbackstop', hideOsd);
currentPlayer = null; currentPlayer = null;
} }
} }
@ -141,11 +142,11 @@ function bindToPlayer(player) {
} }
hideOsd(); hideOsd();
events.on(player, 'volumechange', onVolumeChanged); Events.on(player, 'volumechange', onVolumeChanged);
events.on(player, 'playbackstop', hideOsd); Events.on(player, 'playbackstop', hideOsd);
} }
events.on(playbackManager, 'playerchange', function () { Events.on(playbackManager, 'playerchange', function () {
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

40
src/components/playbackSettings/playbackSettings.js
View file

@ -1,13 +1,15 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import appSettings from 'appSettings'; import appSettings from '../../scripts/settings/appSettings';
import appHost from 'apphost'; import { appHost } from '../apphost';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import qualityoptions from 'qualityoptions'; import qualityoptions from '../qualityOptions';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import loading from '../loading/loading';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/* eslint-disable indent */ /* eslint-disable indent */
@ -145,6 +147,8 @@ import 'emby-checkbox';
showHideQualityFields(context, user, apiClient); showHideQualityFields(context, user, apiClient);
context.querySelector('#selectAllowedAudioChannels').value = userSettings.allowedAudioChannels();
apiClient.getCultures().then(allCultures => { apiClient.getCultures().then(allCultures => {
populateLanguages(context.querySelector('#selectAudioLanguage'), allCultures); populateLanguages(context.querySelector('#selectAudioLanguage'), allCultures);
@ -187,6 +191,7 @@ import 'emby-checkbox';
} }
context.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false; context.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
context.querySelector('.chkPreferFmp4HlsContainer').checked = userSettings.preferFmp4HlsContainer();
context.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode(); context.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode();
context.querySelector('.chkEnableNextVideoOverlay').checked = userSettings.enableNextVideoInfoOverlay(); context.querySelector('.chkEnableNextVideoOverlay').checked = userSettings.enableNextVideoInfoOverlay();
context.querySelector('.chkExternalVideoPlayer').checked = appSettings.enableSystemExternalPlayers(); context.querySelector('.chkExternalVideoPlayer').checked = appSettings.enableSystemExternalPlayers();
@ -222,10 +227,11 @@ import 'emby-checkbox';
setMaxBitrateFromField(context.querySelector('.selectVideoInternetQuality'), false, 'Video'); setMaxBitrateFromField(context.querySelector('.selectVideoInternetQuality'), false, 'Video');
setMaxBitrateFromField(context.querySelector('.selectMusicInternetQuality'), false, 'Audio'); setMaxBitrateFromField(context.querySelector('.selectMusicInternetQuality'), false, 'Audio');
userSettingsInstance.allowedAudioChannels(context.querySelector('#selectAllowedAudioChannels').value);
user.Configuration.AudioLanguagePreference = context.querySelector('#selectAudioLanguage').value; user.Configuration.AudioLanguagePreference = context.querySelector('#selectAudioLanguage').value;
user.Configuration.PlayDefaultAudioTrack = context.querySelector('.chkPlayDefaultAudioTrack').checked; user.Configuration.PlayDefaultAudioTrack = context.querySelector('.chkPlayDefaultAudioTrack').checked;
user.Configuration.EnableNextEpisodeAutoPlay = context.querySelector('.chkEpisodeAutoPlay').checked; user.Configuration.EnableNextEpisodeAutoPlay = context.querySelector('.chkEpisodeAutoPlay').checked;
userSettingsInstance.preferFmp4HlsContainer(context.querySelector('.chkPreferFmp4HlsContainer').checked);
userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked); userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked);
userSettingsInstance.enableNextVideoInfoOverlay(context.querySelector('.chkEnableNextVideoOverlay').checked); userSettingsInstance.enableNextVideoInfoOverlay(context.querySelector('.chkEnableNextVideoOverlay').checked);
@ -243,12 +249,10 @@ import 'emby-checkbox';
saveUser(context, user, userSettings, apiClient).then(() => { saveUser(context, user, userSettings, apiClient).then(() => {
loading.hide(); loading.hide();
if (enableSaveConfirmation) { if (enableSaveConfirmation) {
import('toast').then(({default: toast}) => { toast(globalize.translate('SettingsSaved'));
toast(globalize.translate('SettingsSaved'));
});
} }
events.trigger(instance, 'saved'); Events.trigger(instance, 'saved');
}, () => { }, () => {
loading.hide(); loading.hide();
}); });
@ -257,7 +261,7 @@ import 'emby-checkbox';
function onSubmit(e) { function onSubmit(e) {
const self = this; const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
@ -274,7 +278,7 @@ import 'emby-checkbox';
} }
function embed(options, self) { function embed(options, self) {
return import('text!./playbackSettings.template.html').then(({default: template}) => { return import('./playbackSettings.template.html').then(({default: template}) => {
options.element.innerHTML = globalize.translateHtml(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self)); options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
@ -304,7 +308,7 @@ import 'emby-checkbox';
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => { apiClient.getUser(userId).then(user => {

18
src/components/playbackSettings/playbackSettings.template.html
View file

@ -4,6 +4,16 @@
${HeaderAudioSettings} ${HeaderAudioSettings}
</h2> </h2>
<div class="selectContainer">
<select is="emby-select" id="selectAllowedAudioChannels" label="${LabelAllowedAudioChannels}">
<option value="-1">${Auto}</option>
<option value="1">${LabelSelectMono}</option>
<option value="2">${LabelSelectStereo}</option>
<option value="6">5.1 ${LabelSelectAudioChannels}</option>
<option value="8">7.1 ${LabelSelectAudioChannels}</option>
</select>
</div>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectAudioLanguage" label="${LabelAudioLanguagePreference}"></select> <select is="emby-select" id="selectAudioLanguage" label="${LabelAudioLanguagePreference}"></select>
</div> </div>
@ -49,6 +59,14 @@
${TabAdvanced} ${TabAdvanced}
</h2> </h2>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" class="chkPreferFmp4HlsContainer" />
<span>${PreferFmp4HlsContainer}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${PreferFmp4HlsContainerHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription cinemaModeOptions"> <div class="checkboxContainer checkboxContainer-withDescription cinemaModeOptions">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkEnableCinemaMode" /> <input type="checkbox" is="emby-checkbox" class="chkEnableCinemaMode" />

25
src/components/playerstats/playerstats.js
View file

@ -1,11 +1,12 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import globalize from 'globalize'; import '../../elements/emby-button/paper-icon-button-light';
import playbackManager from 'playbackManager'; import globalize from '../../scripts/globalize';
import syncPlayManager from 'syncPlayManager'; import layoutManager from '../layoutManager';
import playMethodHelper from 'playMethodHelper'; import { playbackManager } from '../playback/playbackmanager';
import layoutManager from 'layoutManager'; import playMethodHelper from '../playback/playmethodhelper';
import 'paper-icon-button-light'; import syncPlayManager from '../syncPlay/syncPlayManager';
import 'css!./playerstats'; import './playerstats.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -94,7 +95,7 @@ import 'css!./playerstats';
return Promise.resolve(instance.lastSession); return Promise.resolve(instance.lastSession);
} }
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId); const apiClient = ServerConnections.getApiClient(playbackManager.currentItem(player).ServerId);
return apiClient.getSessions({ return apiClient.getSessions({
deviceId: apiClient.deviceId() deviceId: apiClient.deviceId()
@ -413,7 +414,7 @@ import 'css!./playerstats';
name: 'Original Media Info' name: 'Original Media Info'
}); });
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId); const apiClient = ServerConnections.getApiClient(playbackManager.currentItem(player).ServerId);
if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) { if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) {
categories.push({ categories.push({
stats: getSyncPlayStats(), stats: getSyncPlayStats(),
@ -450,14 +451,14 @@ import 'css!./playerstats';
}; };
instance.onTimeUpdate = localOnTimeUpdate; instance.onTimeUpdate = localOnTimeUpdate;
events.on(player, 'timeupdate', localOnTimeUpdate); Events.on(player, 'timeupdate', localOnTimeUpdate);
} }
function unbindEvents(instance, player) { function unbindEvents(instance, player) {
const localOnTimeUpdate = instance.onTimeUpdate; const localOnTimeUpdate = instance.onTimeUpdate;
if (localOnTimeUpdate) { if (localOnTimeUpdate) {
events.off(player, 'timeupdate', localOnTimeUpdate); Events.off(player, 'timeupdate', localOnTimeUpdate);
} }
} }

35
src/components/playlisteditor/playlisteditor.js
View file

@ -1,17 +1,18 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-input'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-input/emby-input';
import 'emby-select'; import '../../elements/emby-button/paper-icon-button-light';
import 'material-icons'; import '../../elements/emby-select/emby-select';
import 'css!./../formdialog'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../formdialog.css';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -21,7 +22,7 @@ import 'emby-button';
const panel = dom.parentWithClass(this, 'dialog'); const panel = dom.parentWithClass(this, 'dialog');
const playlistId = panel.querySelector('#selectPlaylistToAddTo').value; const playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
if (playlistId) { if (playlistId) {
userSettings.set('playlisteditor-lastplaylistid', playlistId); userSettings.set('playlisteditor-lastplaylistid', playlistId);
@ -112,7 +113,7 @@ import 'emby-button';
EnableTotalRecordCount: false EnableTotalRecordCount: false
}; };
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => { apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = ''; let html = '';
@ -209,7 +210,7 @@ import 'emby-button';
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then((scrollHelper) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });

8
src/components/playmenu.js
View file

@ -1,7 +1,7 @@
import actionsheet from 'actionsheet'; import actionsheet from './actionSheet/actionSheet';
import datetime from 'datetime'; import datetime from '../scripts/datetime';
import playbackManager from 'playbackManager'; import { playbackManager } from './playback/playbackmanager';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
export function show(options) { export function show(options) {
const item = options.item; const item = options.item;

109
src/components/pluginManager.js
View file

@ -1,5 +1,9 @@
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import loading from './loading/loading';
import appSettings from '../scripts/settings/appSettings';
import { playbackManager } from './playback/playbackmanager';
/* eslint-disable indent */ /* eslint-disable indent */
// TODO: replace with each plugin version // TODO: replace with each plugin version
@ -27,7 +31,7 @@ import globalize from 'globalize';
Emby.App.defineRoute(route, plugin.id); Emby.App.defineRoute(route, plugin.id);
} }
#registerPlugin(plugin) { async #registerPlugin(plugin) {
this.#register(plugin); this.#register(plugin);
if (plugin.getRoutes) { if (plugin.getRoutes) {
@ -38,63 +42,62 @@ import globalize from 'globalize';
if (plugin.type === 'skin') { if (plugin.type === 'skin') {
// translations won't be loaded for skins until needed // translations won't be loaded for skins until needed
return Promise.resolve(plugin); return plugin;
} else { } else {
return new Promise((resolve, reject) => { return await this.#loadStrings(plugin);
this.#loadStrings(plugin)
.then(function () {
resolve(plugin);
})
.catch(reject);
});
} }
} }
loadPlugin(pluginSpec) { async #preparePlugin(pluginSpec, plugin) {
if (typeof pluginSpec === 'string') { if (typeof pluginSpec === 'string') {
console.debug('Loading plugin (via deprecated requirejs method): ' + pluginSpec); // See if it's already installed
const existing = this.plugins.filter(function (p) {
return p.id === plugin.id;
})[0];
return new Promise((resolve, reject) => { if (existing) {
require([pluginSpec], (pluginFactory) => { return pluginSpec;
const plugin = pluginFactory.default ? new pluginFactory.default() : new pluginFactory(); }
// See if it's already installed plugin.installUrl = pluginSpec;
const existing = this.pluginsList.filter(function (p) {
return p.id === plugin.id;
})[0];
if (existing) { const separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
resolve(pluginSpec); plugin.baseUrl = pluginSpec.substring(0, separatorIndex);
}
plugin.installUrl = pluginSpec;
const separatorIndex = Math.max(pluginSpec.lastIndexOf('/'), pluginSpec.lastIndexOf('\\'));
plugin.baseUrl = pluginSpec.substring(0, separatorIndex);
const paths = {};
paths[plugin.id] = plugin.baseUrl;
requirejs.config({
waitSeconds: 0,
paths: paths
});
this.#registerPlugin(plugin).then(resolve).catch(reject);
});
});
} else if (pluginSpec.then) {
return pluginSpec.then(pluginBuilder => {
return pluginBuilder();
}).then((plugin) => {
console.debug(`Plugin loaded: ${plugin.id}`);
return this.#registerPlugin(plugin);
});
} else {
const err = new TypeError('Plugins have to be a Promise that resolves to a plugin builder function or a RequireJS url (deprecated)');
console.error(err);
return Promise.reject(err);
} }
return this.#registerPlugin(plugin);
}
async loadPlugin(pluginSpec) {
let plugin;
if (typeof pluginSpec === 'string') {
if (pluginSpec in window) {
console.log(`Loading plugin (via window): ${pluginSpec}`);
// init plugin and pass basic dependencies
plugin = new window[pluginSpec]({
events: Events,
loading,
appSettings,
playbackManager
});
} else {
console.debug(`Loading plugin (via dynamic import): ${pluginSpec}`);
plugin = await import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`);
}
} else if (pluginSpec.then) {
console.debug('Loading plugin (via promise/async function)');
const pluginResult = await pluginSpec;
plugin = new pluginResult.default;
} else {
const err = new TypeError('Plugins have to be a Promise that resolves to a plugin builder function');
console.error(err);
throw err;
}
return this.#preparePlugin(pluginSpec, plugin);
} }
// In lieu of automatic discovery, plugins will register dynamic objects // In lieu of automatic discovery, plugins will register dynamic objects
@ -103,7 +106,7 @@ import globalize from 'globalize';
// type (skin, screensaver, etc) // type (skin, screensaver, etc)
#register(obj) { #register(obj) {
this.pluginsList.push(obj); this.pluginsList.push(obj);
events.trigger(this, 'registered', [obj]); Events.trigger(this, 'registered', [obj]);
} }
ofType(type) { ofType(type) {
@ -148,4 +151,4 @@ import globalize from 'globalize';
/* eslint-enable indent */ /* eslint-enable indent */
export default new PluginManager(); export const pluginManager = new PluginManager();

24
src/components/prompt/prompt.js
View file

@ -1,14 +1,14 @@
import browser from 'browser'; import browser from '../../scripts/browser';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'formDialogStyle'; import '../formdialog.css';
/* eslint-disable indent */ /* eslint-disable indent */
export default (() => { export default (() => {
@ -117,7 +117,7 @@ export default (() => {
} else { } else {
return options => { return options => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
import('text!./prompt.template.html').then(({default: template}) => { import('./prompt.template.html').then(({default: template}) => {
if (typeof options === 'string') { if (typeof options === 'string') {
options = { options = {
title: '', title: '',

2
src/components/qualityOptions.js
View file

@ -1,4 +1,4 @@
import globalize from 'globalize'; import globalize from '../scripts/globalize';
export function getVideoQualityOptions(options) { export function getVideoQualityOptions(options) {
const maxStreamingBitrate = options.currentMaxBitrate; const maxStreamingBitrate = options.currentMaxBitrate;

5
src/components/quickConnectSettings/quickConnectSettings.js
View file

@ -1,5 +1,6 @@
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import toast from 'toast'; import toast from '../toast/toast';
import Dashboard from '../../scripts/clientUtils';
export class QuickConnectSettings { export class QuickConnectSettings {
constructor() { } constructor() { }

13
src/components/recordingcreator/recordingbutton.js
View file

@ -1,8 +1,9 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import recordingHelper from 'recordingHelper'; import recordingHelper from './recordinghelper';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'css!./recordingfields'; import './recordingfields.css';
import ServerConnections from '../ServerConnections';
function onRecordingButtonClick(e) { function onRecordingButtonClick(e) {
const item = this.item; const item = this.item;
@ -52,7 +53,7 @@ class RecordingButton {
} }
refresh(serverId, itemId) { refresh(serverId, itemId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const self = this; const self = this;
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
self.refreshItem(item); self.refreshItem(item);

61
src/components/recordingcreator/recordingcreator.js
View file

@ -1,22 +1,23 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import mediaInfo from 'mediaInfo'; import mediaInfo from '../mediainfo/mediainfo';
import require from 'require'; import loading from '../loading/loading';
import loading from 'loading'; import scrollHelper from '../../scripts/scrollHelper';
import scrollHelper from 'scrollHelper'; import datetime from '../../scripts/datetime';
import datetime from 'datetime'; import imageLoader from '../images/imageLoader';
import imageLoader from 'imageLoader'; import recordingFields from './recordingfields';
import recordingFields from 'recordingFields'; import { Events } from 'jellyfin-apiclient';
import events from 'events'; import '../../elements/emby-button/emby-button';
import 'emby-checkbox'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-button'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-collapse'; import '../../elements/emby-collapse/emby-collapse';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'paper-icon-button-light'; import '../formdialog.css';
import 'css!./../formdialog'; import './recordingcreator.css';
import 'css!./recordingcreator'; import 'material-design-icons-iconfont';
import 'material-icons'; import ServerConnections from '../ServerConnections';
import { playbackManager } from '../playback/playbackmanager';
let currentDialog; let currentDialog;
let closeAction; let closeAction;
@ -68,7 +69,7 @@ function renderRecording(context, defaultTimer, program, apiClient, refreshRecor
const imageContainer = context.querySelector('.recordingDialog-imageContainer'); const imageContainer = context.querySelector('.recordingDialog-imageContainer');
if (imgUrl) { if (imgUrl) {
imageContainer.innerHTML = '<img src="' + require.toUrl('.').split('?')[0] + '/empty.png" data-src="' + imgUrl + '" class="recordingDialog-img lazy" />'; imageContainer.innerHTML = '<img src="./empty.png" data-src="' + imgUrl + '" class="recordingDialog-img lazy" />';
imageContainer.classList.remove('hide'); imageContainer.classList.remove('hide');
imageLoader.lazyChildren(imageContainer); imageLoader.lazyChildren(imageContainer);
@ -102,7 +103,7 @@ function renderRecording(context, defaultTimer, program, apiClient, refreshRecor
function reload(context, programId, serverId, refreshRecordingStateOnly) { function reload(context, programId, serverId, refreshRecordingStateOnly) {
loading.show(); loading.show();
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId }); const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId });
const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()); const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
@ -117,14 +118,12 @@ function reload(context, programId, serverId, refreshRecordingStateOnly) {
function executeCloseAction(action, programId, serverId) { function executeCloseAction(action, programId, serverId) {
if (action === 'play') { if (action === 'play') {
import('playbackManager').then(({ default: playbackManager }) => { const apiClient = ServerConnections.getApiClient(serverId);
const apiClient = window.connectionManager.getApiClient(serverId);
apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) { apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
playbackManager.play({ playbackManager.play({
ids: [item.ChannelId], ids: [item.ChannelId],
serverId: serverId serverId: serverId
});
}); });
}); });
return; return;
@ -137,7 +136,7 @@ function showEditor(itemId, serverId) {
loading.show(); loading.show();
import('text!./recordingcreator.template.html').then(({ default: template }) => { import('./recordingcreator.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
@ -167,7 +166,7 @@ function showEditor(itemId, serverId) {
} }
dlg.addEventListener('close', function () { dlg.addEventListener('close', function () {
events.off(currentRecordingFields, 'recordingchanged', onRecordingChanged); Events.off(currentRecordingFields, 'recordingchanged', onRecordingChanged);
executeCloseAction(closeAction, itemId, serverId); executeCloseAction(closeAction, itemId, serverId);
if (currentRecordingFields && currentRecordingFields.hasChanged()) { if (currentRecordingFields && currentRecordingFields.hasChanged()) {
@ -191,7 +190,7 @@ function showEditor(itemId, serverId) {
serverId: serverId serverId: serverId
}); });
events.on(currentRecordingFields, 'recordingchanged', onRecordingChanged); Events.on(currentRecordingFields, 'recordingchanged', onRecordingChanged);
dialogHelper.open(dlg); dialogHelper.open(dlg);
}); });

40
src/components/recordingcreator/recordingeditor.js
View file

@ -1,17 +1,19 @@
import dialogHelper from 'dialogHelper';
import globalize from 'globalize'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import layoutManager from '../layoutManager';
import scrollHelper from 'scrollHelper'; import loading from '../loading/loading';
import 'scrollStyles'; import scrollHelper from '../../scripts/scrollHelper';
import 'emby-button'; import '../../assets/css/scrollstyles.css';
import 'emby-collapse'; import '../../elements/emby-button/emby-button';
import 'emby-input'; import '../../elements/emby-collapse/emby-collapse';
import 'paper-icon-button-light'; import '../../elements/emby-input/emby-input';
import 'css!./../formdialog'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./recordingcreator'; import '../formdialog.css';
import 'material-icons'; import './recordingcreator.css';
import 'flexStyles'; import 'material-design-icons-iconfont';
import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
let currentDialog; let currentDialog;
let recordingDeleted = false; let recordingDeleted = false;
@ -20,7 +22,7 @@ let currentServerId;
let currentResolve; let currentResolve;
function deleteTimer(apiClient, timerId) { function deleteTimer(apiClient, timerId) {
return import('recordingHelper').then(({ default: recordingHelper }) => { return import('./recordinghelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId()); recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId());
}); });
} }
@ -40,7 +42,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) { function onSubmit(e) {
const form = this; const form = this;
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) { apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60; item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -60,7 +62,7 @@ function init(context) {
}); });
context.querySelector('.btnCancelRecording').addEventListener('click', function () { context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () { deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true); closeDialog(true);
@ -74,7 +76,7 @@ function reload(context, id) {
loading.show(); loading.show();
currentItemId = id; currentItemId = id;
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
apiClient.getLiveTvTimer(id).then(function (result) { apiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result, apiClient); renderTimer(context, result, apiClient);
loading.hide(); loading.hide();
@ -89,7 +91,7 @@ function showEditor(itemId, serverId, options) {
options = options || {}; options = options || {};
currentResolve = resolve; currentResolve = resolve;
import('text!./recordingeditor.template.html').then(({default: template}) => { import('./recordingeditor.template.html').then(({default: template}) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

58
src/components/recordingcreator/recordingfields.js
View file

@ -1,13 +1,15 @@
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import serverNotifications from 'serverNotifications'; import { Events } from 'jellyfin-apiclient';
import loading from 'loading'; import serverNotifications from '../../scripts/serverNotifications';
import dom from 'dom'; import loading from '../loading/loading';
import recordingHelper from 'recordingHelper'; import dom from '../../scripts/dom';
import events from 'events'; import recordingHelper from './recordinghelper';
import 'paper-icon-button-light'; import '../../elements/emby-button/emby-button';
import 'emby-button'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./recordingfields'; import './recordingfields.css';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -45,7 +47,7 @@ function loadData(parent, program, apiClient) {
function fetchData(instance) { function fetchData(instance) {
const options = instance.options; const options = instance.options;
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
options.parent.querySelector('.recordingFields').classList.remove('hide'); options.parent.querySelector('.recordingFields').classList.remove('hide');
return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) { return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
@ -104,20 +106,20 @@ class RecordingEditor {
const timerChangedHandler = onTimerChangedExternally.bind(this); const timerChangedHandler = onTimerChangedExternally.bind(this);
this.timerChangedHandler = timerChangedHandler; this.timerChangedHandler = timerChangedHandler;
events.on(serverNotifications, 'TimerCreated', timerChangedHandler); Events.on(serverNotifications, 'TimerCreated', timerChangedHandler);
events.on(serverNotifications, 'TimerCancelled', timerChangedHandler); Events.on(serverNotifications, 'TimerCancelled', timerChangedHandler);
const seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this); const seriesTimerChangedHandler = onSeriesTimerChangedExternally.bind(this);
this.seriesTimerChangedHandler = seriesTimerChangedHandler; this.seriesTimerChangedHandler = seriesTimerChangedHandler;
events.on(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler); Events.on(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
events.on(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler); Events.on(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
} }
embed() { embed() {
const self = this; const self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('text!./recordingfields.template.html').then(({default: template}) => { import('./recordingfields.template.html').then(({default: template}) => {
const options = self.options; const options = self.options;
const context = options.parent; const context = options.parent;
context.innerHTML = globalize.translateHtml(template, 'core'); context.innerHTML = globalize.translateHtml(template, 'core');
@ -144,14 +146,14 @@ class RecordingEditor {
const timerChangedHandler = this.timerChangedHandler; const timerChangedHandler = this.timerChangedHandler;
this.timerChangedHandler = null; this.timerChangedHandler = null;
events.off(serverNotifications, 'TimerCreated', timerChangedHandler); Events.off(serverNotifications, 'TimerCreated', timerChangedHandler);
events.off(serverNotifications, 'TimerCancelled', timerChangedHandler); Events.off(serverNotifications, 'TimerCancelled', timerChangedHandler);
const seriesTimerChangedHandler = this.seriesTimerChangedHandler; const seriesTimerChangedHandler = this.seriesTimerChangedHandler;
this.seriesTimerChangedHandler = null; this.seriesTimerChangedHandler = null;
events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler); Events.off(serverNotifications, 'SeriesTimerCreated', seriesTimerChangedHandler);
events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler); Events.off(serverNotifications, 'SeriesTimerCancelled', seriesTimerChangedHandler);
} }
} }
@ -162,7 +164,7 @@ function onManageRecordingClick(e) {
} }
const self = this; const self = this;
import('recordingEditor').then(({default: recordingEditor}) => { import('./recordingeditor').then(({default: recordingEditor}) => {
recordingEditor.show(self.TimerId, options.serverId, { recordingEditor.show(self.TimerId, options.serverId, {
enableCancel: false enableCancel: false
}).then(function () { }).then(function () {
@ -180,7 +182,7 @@ function onManageSeriesRecordingClick(e) {
const self = this; const self = this;
import('seriesRecordingEditor').then(({default: seriesRecordingEditor}) => { import('./seriesrecordingeditor').then(({default: seriesRecordingEditor}) => {
seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, { seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
enableCancel: false enableCancel: false
@ -196,7 +198,7 @@ function onRecordChange(e) {
const self = this; const self = this;
const options = this.options; const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON'); const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
@ -207,7 +209,7 @@ function onRecordChange(e) {
if (!hasEnabledTimer) { if (!hasEnabledTimer) {
loading.show(); loading.show();
recordingHelper.createRecording(apiClient, options.programId, false).then(function () { recordingHelper.createRecording(apiClient, options.programId, false).then(function () {
events.trigger(self, 'recordingchanged'); Events.trigger(self, 'recordingchanged');
fetchData(self); fetchData(self);
loading.hide(); loading.hide();
}); });
@ -216,7 +218,7 @@ function onRecordChange(e) {
if (hasEnabledTimer) { if (hasEnabledTimer) {
loading.show(); loading.show();
recordingHelper.cancelTimer(apiClient, this.TimerId, true).then(function () { recordingHelper.cancelTimer(apiClient, this.TimerId, true).then(function () {
events.trigger(self, 'recordingchanged'); Events.trigger(self, 'recordingchanged');
fetchData(self); fetchData(self);
loading.hide(); loading.hide();
}); });
@ -225,9 +227,7 @@ function onRecordChange(e) {
} }
function sendToast(msg) { function sendToast(msg) {
import('toast').then(({default: toast}) => { toast(msg);
toast(msg);
});
} }
function onRecordSeriesChange(e) { function onRecordSeriesChange(e) {
@ -235,7 +235,7 @@ function onRecordSeriesChange(e) {
const self = this; const self = this;
const options = this.options; const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON'); const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active'); const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');

161
src/components/recordingcreator/recordinghelper.js
View file

@ -1,5 +1,9 @@
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import loading from 'loading'; import loading from '../loading/loading';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
import confirm from '../confirm/confirm';
import dialog from '../dialog/dialog';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -28,48 +32,42 @@ function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCanc
function cancelTimerWithConfirmation(timerId, serverId) { function cancelTimerWithConfirmation(timerId, serverId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('confirm').then(({ default: confirm }) => { confirm({
confirm.default({
text: globalize.translate('MessageConfirmRecordingCancellation'), text: globalize.translate('MessageConfirmRecordingCancellation'),
primary: 'delete', primary: 'delete',
confirmText: globalize.translate('HeaderCancelRecording'), confirmText: globalize.translate('HeaderCancelRecording'),
cancelText: globalize.translate('HeaderKeepRecording') cancelText: globalize.translate('HeaderKeepRecording')
}).then(function () { }).then(function () {
loading.show(); loading.show();
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
cancelTimer(apiClient, timerId, true).then(resolve, reject); cancelTimer(apiClient, timerId, true).then(resolve, reject);
}, reject); }, reject);
});
}); });
} }
function cancelSeriesTimerWithConfirmation(timerId, serverId) { function cancelSeriesTimerWithConfirmation(timerId, serverId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('confirm').then(({ default: confirm }) => { confirm({
confirm.default({
text: globalize.translate('MessageConfirmRecordingCancellation'), text: globalize.translate('MessageConfirmRecordingCancellation'),
primary: 'delete', primary: 'delete',
confirmText: globalize.translate('HeaderCancelSeries'), confirmText: globalize.translate('HeaderCancelSeries'),
cancelText: globalize.translate('HeaderKeepSeries') cancelText: globalize.translate('HeaderKeepSeries')
}).then(function () { }).then(function () {
loading.show(); loading.show();
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
apiClient.cancelLiveTvSeriesTimer(timerId).then(function () { apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
import('toast').then(({default: toast}) => { toast(globalize.translate('SeriesCancelled'));
toast(globalize.translate('SeriesCancelled'));
});
loading.hide(); loading.hide();
resolve(); resolve();
}, reject);
}, reject); }, reject);
}); }, reject);
}); });
} }
@ -98,75 +96,66 @@ function createRecording(apiClient, programId, isSeries) {
} }
function sendToast(msg) { function sendToast(msg) {
import('toast').then(({ default: toast }) => { toast(msg);
toast(msg);
});
} }
function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) { function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('dialog').then(({ default: dialog }) => { const items = [];
const items = [];
items.push({
name: globalize.translate('HeaderKeepRecording'),
id: 'cancel',
type: 'submit'
});
if (timerStatus === 'InProgress') {
items.push({ items.push({
name: globalize.translate('HeaderKeepRecording'), name: globalize.translate('HeaderStopRecording'),
id: 'cancel', id: 'canceltimer',
type: 'submit'
});
if (timerStatus === 'InProgress') {
items.push({
name: globalize.translate('HeaderStopRecording'),
id: 'canceltimer',
type: 'cancel'
});
} else {
items.push({
name: globalize.translate('HeaderCancelRecording'),
id: 'canceltimer',
type: 'cancel'
});
}
items.push({
name: globalize.translate('HeaderCancelSeries'),
id: 'cancelseriestimer',
type: 'cancel' type: 'cancel'
}); });
} else {
items.push({
name: globalize.translate('HeaderCancelRecording'),
id: 'canceltimer',
type: 'cancel'
});
}
dialog({ items.push({
name: globalize.translate('HeaderCancelSeries'),
text: globalize.translate('MessageConfirmRecordingCancellation'), id: 'cancelseriestimer',
buttons: items type: 'cancel'
}).then(function (result) {
const apiClient = window.connectionManager.getApiClient(serverId);
if (result === 'canceltimer') {
loading.show();
cancelTimer(apiClient, timerId, true).then(resolve, reject);
} else if (result === 'cancelseriestimer') {
loading.show();
apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
import('toast').then(({ default: toast }) => {
toast(globalize.translate('SeriesCancelled'));
});
loading.hide();
resolve();
}, reject);
} else {
resolve();
}
}, reject);
}); });
dialog.show({
text: globalize.translate('MessageConfirmRecordingCancellation'),
buttons: items
}).then(function (result) {
const apiClient = ServerConnections.getApiClient(serverId);
if (result === 'canceltimer') {
loading.show();
cancelTimer(apiClient, timerId, true).then(resolve, reject);
} else if (result === 'cancelseriestimer') {
loading.show();
apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
toast(globalize.translate('SeriesCancelled'));
loading.hide();
resolve();
}, reject);
} else {
resolve();
}
}, reject);
}); });
} }
function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) { function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
const hasTimer = timerId && timerStatus !== 'Cancelled'; const hasTimer = timerId && timerStatus !== 'Cancelled';
if (seriesTimerId && hasTimer) { if (seriesTimerId && hasTimer) {
// cancel // cancel

45
src/components/recordingcreator/seriesrecordingeditor.js
View file

@ -1,19 +1,20 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import loading from 'loading'; import loading from '../loading/loading';
import scrollHelper from 'scrollHelper'; import scrollHelper from '../../scripts/scrollHelper';
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import 'scrollStyles'; import '../../assets/css/scrollstyles.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./../formdialog'; import '../formdialog.css';
import 'css!./recordingcreator'; import './recordingcreator.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -25,7 +26,7 @@ let currentServerId;
function deleteTimer(apiClient, timerId) { function deleteTimer(apiClient, timerId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('recordingHelper').then(({ default: recordingHelper }) => { import('./recordinghelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelSeriesTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject); recordingHelper.cancelSeriesTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
}); });
}); });
@ -63,7 +64,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) { function onSubmit(e) {
const form = this; const form = this;
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) { apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60; item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -91,7 +92,7 @@ function init(context) {
}); });
context.querySelector('.btnCancelRecording').addEventListener('click', function () { context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () { deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true); closeDialog(true);
}); });
@ -101,7 +102,7 @@ function init(context) {
} }
function reload(context, id) { function reload(context, id) {
const apiClient = window.connectionManager.getApiClient(currentServerId); const apiClient = ServerConnections.getApiClient(currentServerId);
loading.show(); loading.show();
if (typeof id === 'string') { if (typeof id === 'string') {
@ -150,7 +151,7 @@ function embed(itemId, serverId, options) {
loading.show(); loading.show();
options = options || {}; options = options || {};
import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => { import('./seriesrecordingeditor.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false
@ -192,7 +193,7 @@ function showEditor(itemId, serverId, options) {
loading.show(); loading.show();
options = options || {}; options = options || {};
import('text!./seriesrecordingeditor.template.html').then(({ default: template }) => { import('./seriesrecordingeditor.template.html').then(({ default: template }) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

34
src/components/refreshdialog/refreshdialog.js
View file

@ -1,15 +1,17 @@
import dom from 'dom'; import dom from '../../scripts/dom';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import loading from 'loading'; import loading from '../loading/loading';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'emby-checkbox'; import '../../elements/emby-button/emby-button';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'emby-select'; import '../../elements/emby-checkbox/emby-checkbox';
import 'material-icons'; import '../../elements/emby-select/emby-select';
import 'css!./../formdialog'; import 'material-design-icons-iconfont';
import 'emby-button'; import '../formdialog.css';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -52,7 +54,7 @@ function getEditorHtml() {
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -65,7 +67,7 @@ function onSubmit(e) {
const dlg = dom.parentWithClass(e.target, 'dialog'); const dlg = dom.parentWithClass(e.target, 'dialog');
const options = instance.options; const options = instance.options;
const apiClient = window.connectionManager.getApiClient(options.serverId); const apiClient = ServerConnections.getApiClient(options.serverId);
const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all'; const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all';
@ -85,9 +87,7 @@ function onSubmit(e) {
dialogHelper.close(dlg); dialogHelper.close(dlg);
import('toast').then(({default: toast}) => { toast(globalize.translate('RefreshQueued'));
toast(globalize.translate('RefreshQueued'));
});
loading.hide(); loading.hide();

117
src/components/remotecontrol/remotecontrol.js
View file

@ -1,20 +1,23 @@
import datetime from 'datetime'; import datetime from '../../scripts/datetime';
import backdrop from 'backdrop'; import backdrop from '../backdrop/backdrop';
import listView from 'listView'; import listView from '../listview/listview';
import imageLoader from 'imageLoader'; import imageLoader from '../images/imageLoader';
import playbackManager from 'playbackManager'; import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from 'nowPlayingHelper'; import nowPlayingHelper from '../playback/nowplayinghelper';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import appHost from 'apphost'; import { appHost } from '../apphost';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import cardBuilder from 'cardBuilder'; import cardBuilder from '../cardbuilder/cardBuilder';
import itemContextMenu from 'itemContextMenu'; import itemContextMenu from '../itemContextMenu';
import 'cardStyle'; import '../cardbuilder/card.css';
import 'emby-itemscontainer'; import '../../elements/emby-itemscontainer/emby-itemscontainer';
import 'css!./remotecontrol.css'; import './remotecontrol.css';
import 'emby-ratingbutton'; import '../../elements/emby-ratingbutton/emby-ratingbutton';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
import { appRouter } from '../appRouter';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -37,7 +40,7 @@ function showAudioMenu(context, player, button, item) {
return menuItem; return menuItem;
}); });
import('actionsheet').then(({ default: actionsheet }) => { import('../actionSheet/actionSheet').then((actionsheet) => {
actionsheet.show({ actionsheet.show({
items: menuItems, items: menuItems,
positionTo: button, positionTo: button,
@ -69,7 +72,7 @@ function showSubtitleMenu(context, player, button, item) {
selected: currentIndex == null selected: currentIndex == null
}); });
import('actionsheet').then(({ default: actionsheet }) => { import('../actionSheet/actionSheet').then((actionsheet) => {
actionsheet.show({ actionsheet.show({
items: menuItems, items: menuItems,
positionTo: button, positionTo: button,
@ -95,18 +98,18 @@ function seriesImageUrl(item, options) {
options.type = options.type || 'Primary'; options.type = options.type || 'Primary';
if (options.type === 'Primary' && item.SeriesPrimaryImageTag) { if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag; options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (options.type === 'Thumb') { if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} }
if (item.ParentThumbImageTag) { if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
} }
} }
@ -119,12 +122,12 @@ function imageUrl(item, options) {
if (item.ImageTags && item.ImageTags[options.type]) { if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type]; options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
} }
if (item.AlbumId && item.AlbumPrimaryImageTag) { if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return ServerConnections.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
return null; return null;
@ -215,7 +218,7 @@ function updateNowPlayingInfo(context, state, serverId) {
openAlbum: false, openAlbum: false,
positionTo: contextButton positionTo: contextButton
}; };
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
apiClient.getCurrentUser().then(function (user) { apiClient.getCurrentUser().then(function (user) {
contextButton.addEventListener('click', function () { contextButton.addEventListener('click', function () {
@ -597,7 +600,7 @@ export default function () {
if (!state.NextMediaType) { if (!state.NextMediaType) {
updatePlayerState(player, dlg, {}); updatePlayerState(player, dlg, {});
Emby.Page.back(); appRouter.back();
} }
} }
@ -631,18 +634,18 @@ export default function () {
const player = currentPlayer; const player = currentPlayer;
if (player) { if (player) {
events.off(player, 'playbackstart', onPlaybackStart); Events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'statechange', onStateChanged); Events.off(player, 'statechange', onStateChanged);
events.off(player, 'repeatmodechange', onRepeatModeChange); Events.off(player, 'repeatmodechange', onRepeatModeChange);
events.off(player, 'shufflequeuemodechange', onShuffleQueueModeChange); Events.off(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.off(player, 'playlistitemremove', onPlaylistItemRemoved); Events.off(player, 'playlistitemremove', onPlaylistItemRemoved);
events.off(player, 'playlistitemmove', onPlaylistUpdate); Events.off(player, 'playlistitemmove', onPlaylistUpdate);
events.off(player, 'playlistitemadd', onPlaylistUpdate); Events.off(player, 'playlistitemadd', onPlaylistUpdate);
events.off(player, 'playbackstop', onPlaybackStopped); Events.off(player, 'playbackstop', onPlaybackStopped);
events.off(player, 'volumechange', onVolumeChanged); Events.off(player, 'volumechange', onVolumeChanged);
events.off(player, 'pause', onPlayPauseStateChanged); Events.off(player, 'pause', onPlayPauseStateChanged);
events.off(player, 'unpause', onPlayPauseStateChanged); Events.off(player, 'unpause', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate); Events.off(player, 'timeupdate', onTimeUpdate);
currentPlayer = null; currentPlayer = null;
} }
} }
@ -653,18 +656,18 @@ export default function () {
onStateChanged.call(player, { onStateChanged.call(player, {
type: 'init' type: 'init'
}, state); }, state);
events.on(player, 'playbackstart', onPlaybackStart); Events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'statechange', onStateChanged); Events.on(player, 'statechange', onStateChanged);
events.on(player, 'repeatmodechange', onRepeatModeChange); Events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange); Events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemremove', onPlaylistItemRemoved); Events.on(player, 'playlistitemremove', onPlaylistItemRemoved);
events.on(player, 'playlistitemmove', onPlaylistUpdate); Events.on(player, 'playlistitemmove', onPlaylistUpdate);
events.on(player, 'playlistitemadd', onPlaylistUpdate); Events.on(player, 'playlistitemadd', onPlaylistUpdate);
events.on(player, 'playbackstop', onPlaybackStopped); Events.on(player, 'playbackstop', onPlaybackStopped);
events.on(player, 'volumechange', onVolumeChanged); Events.on(player, 'volumechange', onVolumeChanged);
events.on(player, 'pause', onPlayPauseStateChanged); Events.on(player, 'pause', onPlayPauseStateChanged);
events.on(player, 'unpause', onPlayPauseStateChanged); Events.on(player, 'unpause', onPlayPauseStateChanged);
events.on(player, 'timeupdate', onTimeUpdate); Events.on(player, 'timeupdate', onTimeUpdate);
const playerInfo = playbackManager.getPlayerInfo(); const playerInfo = playbackManager.getPlayerInfo();
const supportedCommands = playerInfo.supportedCommands; const supportedCommands = playerInfo.supportedCommands;
currentPlayerSupportedCommands = supportedCommands; currentPlayerSupportedCommands = supportedCommands;
@ -693,7 +696,7 @@ export default function () {
} }
function savePlaylist() { function savePlaylist() {
import('playlistEditor').then(({ default: playlistEditor }) => { import('../playlisteditor/playlisteditor').then(({ default: playlistEditor }) => {
getSaveablePlaylistItems().then(function (items) { getSaveablePlaylistItems().then(function (items) {
const serverId = items.length ? items[0].ServerId : ApiClient.serverId(); const serverId = items.length ? items[0].ServerId : ApiClient.serverId();
new playlistEditor({ new playlistEditor({
@ -863,9 +866,7 @@ export default function () {
}, currentPlayer); }, currentPlayer);
form.querySelector('input').value = ''; form.querySelector('input').value = '';
import('toast').then(({ default: toast }) => { toast('Message sent.');
toast('Message sent.');
});
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -882,9 +883,7 @@ export default function () {
}, currentPlayer); }, currentPlayer);
form.querySelector('input').value = ''; form.querySelector('input').value = '';
import('toast').then(({ default: toast }) => { toast('Text sent.');
toast('Text sent.');
});
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -915,7 +914,7 @@ export default function () {
bindEvents(context); bindEvents(context);
context.querySelector('.sendMessageForm').addEventListener('submit', onMessageSubmit); context.querySelector('.sendMessageForm').addEventListener('submit', onMessageSubmit);
context.querySelector('.typeTextForm').addEventListener('submit', onSendStringSubmit); context.querySelector('.typeTextForm').addEventListener('submit', onSendStringSubmit);
events.on(playbackManager, 'playerchange', onPlayerChange); Events.on(playbackManager, 'playerchange', onPlayerChange);
if (layoutManager.tv) { if (layoutManager.tv) {
const positionSlider = context.querySelector('.nowPlayingPositionSlider'); const positionSlider = context.querySelector('.nowPlayingPositionSlider');
@ -926,7 +925,7 @@ export default function () {
function onDialogClosed(e) { function onDialogClosed(e) {
releaseCurrentPlayer(); releaseCurrentPlayer();
events.off(playbackManager, 'playerchange', onPlayerChange); Events.off(playbackManager, 'playerchange', onPlayerChange);
lastPlayerState = null; lastPlayerState = null;
} }

72
src/components/require/requirecss.js
View file

@ -1,72 +0,0 @@
define(function () {
'use strict';
const requireCss = {};
requireCss.normalize = function (name, normalize) {
if (name.substr(name.length - 4, 4) === '.css') {
name = name.substr(0, name.length - 4);
}
return normalize(name);
};
let importedCss = [];
function isLoaded(url) {
return importedCss.indexOf(url) !== -1;
}
function removeFromLoadHistory(url) {
url = url.toLowerCase();
importedCss = importedCss.filter(function (c) {
return url.indexOf(c.toLowerCase()) === -1;
});
}
requireCss.load = function (cssId, req, load, config) {
// Somehow if the url starts with /css, require will get all screwed up since this extension is also called css
const srch = 'components/require/requirecss';
const index = cssId.indexOf(srch);
if (index !== -1) {
cssId = 'css' + cssId.substring(index + srch.length);
}
let url = cssId + '.css';
if (url.indexOf('://') === -1) {
url = config.baseUrl + url;
}
if (!isLoaded(url)) {
importedCss.push(url);
const link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('type', 'text/css');
link.onload = load;
let linkUrl = url;
if (config.urlArgs) {
linkUrl += config.urlArgs(cssId, url);
}
link.setAttribute('href', linkUrl);
document.head.appendChild(link);
} else {
load();
}
};
window.requireCss = {
removeStylesheet: function (stylesheet) {
stylesheet.parentNode.removeChild(stylesheet);
removeFromLoadHistory(stylesheet.href);
}
};
return requireCss;
});

42
src/components/require/requiretext.js
View file

@ -1,42 +0,0 @@
define(function () {
'use strict';
// hack to work around the server's auto-redirection feature
const addRedirectPrevention = window.dashboardVersion != null && window.Dashboard && !window.AppInfo.isNativeApp;
return {
load: function (url, req, load, config) {
if (url.indexOf('://') === -1) {
url = config.baseUrl + url;
}
if (config.urlArgs) {
url += config.urlArgs(url, url);
}
if (addRedirectPrevention) {
if (url.indexOf('?') === -1) {
url += '?';
} else {
url += '&';
}
url += 'r=0';
}
const xhr = new XMLHttpRequest();
xhr.open('GET', url, true);
xhr.onload = function (e) {
load(this.response);
};
xhr.send();
},
normalize: function (name, normalize) {
return normalize(name);
}
};
});

6
src/components/scrollManager.js
View file

@ -5,9 +5,9 @@
* @module components/scrollManager * @module components/scrollManager
*/ */
import dom from 'dom'; import dom from '../scripts/dom';
import browser from 'browser'; import browser from '../scripts/browser';
import layoutManager from 'layoutManager'; import layoutManager from './layoutManager';
/** /**
* Scroll time in ms. * Scroll time in ms.

22
src/components/search/searchfields.js
View file

@ -1,12 +1,12 @@
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import browser from 'browser'; import browser from '../../scripts/browser';
import AlphaPicker from 'alphaPicker'; import AlphaPicker from '../alphaPicker/alphaPicker';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'css!./searchfields'; import './searchfields.css';
/* eslint-disable indent */ /* eslint-disable indent */
@ -15,7 +15,7 @@ import 'css!./searchfields';
let value = instance.nextSearchValue; let value = instance.nextSearchValue;
value = (value || '').trim(); value = (value || '').trim();
events.trigger(instance, 'search', [value]); Events.trigger(instance, 'search', [value]);
} }
function triggerSearch(instance, value) { function triggerSearch(instance, value) {
@ -61,7 +61,7 @@ import 'css!./searchfields';
} }
function embed(elem, instance, options) { function embed(elem, instance, options) {
import('text!./searchfields.template.html').then(({default: template}) => { import('./searchfields.template.html').then(({default: template}) => {
let html = globalize.translateHtml(template, 'core'); let html = globalize.translateHtml(template, 'core');
if (browser.tizen || browser.orsay) { if (browser.tizen || browser.orsay) {

19
src/components/search/searchresults.js
View file

@ -1,10 +1,11 @@
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import cardBuilder from 'cardBuilder'; import cardBuilder from '../cardbuilder/cardBuilder';
import appRouter from 'appRouter'; import { appRouter } from '../appRouter';
import 'emby-scroller'; import '../../elements/emby-scroller/emby-scroller';
import 'emby-itemscontainer'; import '../../elements/emby-itemscontainer/emby-itemscontainer';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import ServerConnections from '../ServerConnections';
/* eslint-disable indent */ /* eslint-disable indent */
@ -584,7 +585,7 @@ import 'emby-button';
} }
function embed(elem, instance, options) { function embed(elem, instance, options) {
import('text!./searchresults.template.html').then(({default: template}) => { import('./searchresults.template.html').then(({default: template}) => {
if (!enableScrollX()) { if (!enableScrollX()) {
template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"'); template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"');
template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap'); template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap');
@ -605,7 +606,7 @@ class SearchResults {
embed(options.element, this, options); embed(options.element, this, options);
} }
search(value) { search(value) {
const apiClient = window.connectionManager.getApiClient(this.options.serverId); const apiClient = ServerConnections.getApiClient(this.options.serverId);
search(this, apiClient, this.options.element, value); search(this, apiClient, this.options.element, value);
} }

45
src/components/serviceworker/notifications.js
View file

@ -1,45 +0,0 @@
/* eslint-env serviceworker */
(function () {
'use strict';
let connectionManager;
function getApiClient(serverId) {
if (connectionManager) {
return Promise.resolve(connectionManager.getApiClient(serverId));
}
return Promise.reject();
}
function executeAction(action, data, serverId) {
return getApiClient(serverId).then(function (apiClient) {
switch (action) {
case 'cancel-install':
return apiClient.cancelPackageInstallation(data.id);
case 'restart':
return apiClient.restartServer();
default:
clients.openWindow('/');
return Promise.resolve();
}
});
}
/* eslint-disable-next-line no-restricted-globals -- self is valid in a serviceworker environment */
self.addEventListener('notificationclick', function (event) {
const notification = event.notification;
notification.close();
const data = notification.data;
const serverId = data.serverId;
const action = event.action;
if (!action) {
clients.openWindow('/');
event.waitUntil(Promise.resolve());
return;
}
event.waitUntil(executeAction(action, data, serverId));
}, false);
})();

2
src/components/settingshelper.js
View file

@ -1,4 +1,4 @@
import globalize from 'globalize'; import globalize from '../scripts/globalize';
/** /**
* Helper for handling settings. * Helper for handling settings.

41
src/components/shortcuts.js
View file

@ -5,12 +5,14 @@
* @module components/shortcuts * @module components/shortcuts
*/ */
import playbackManager from 'playbackManager'; import { playbackManager } from './playback/playbackmanager';
import inputManager from 'inputManager'; import inputManager from '../scripts/inputManager';
import appRouter from 'appRouter'; import { appRouter } from './appRouter';
import globalize from 'globalize'; import globalize from '../scripts/globalize';
import dom from 'dom'; import dom from '../scripts/dom';
import recordingHelper from 'recordingHelper'; import recordingHelper from './recordingcreator/recordinghelper';
import ServerConnections from './ServerConnections';
import toast from './toast/toast';
function playAllFromHere(card, serverId, queue) { function playAllFromHere(card, serverId, queue) {
const parent = card.parentNode; const parent = card.parentNode;
@ -69,7 +71,7 @@ import recordingHelper from 'recordingHelper';
} }
function showProgramDialog(item) { function showProgramDialog(item) {
import('recordingCreator').then(({default:recordingCreator}) => { import('./recordingcreator/recordingcreator').then(({default:recordingCreator}) => {
recordingCreator.show(item.Id, item.ServerId); recordingCreator.show(item.Id, item.ServerId);
}); });
} }
@ -80,7 +82,7 @@ import recordingHelper from 'recordingHelper';
const id = button.getAttribute('data-id'); const id = button.getAttribute('data-id');
const type = button.getAttribute('data-type'); const type = button.getAttribute('data-type');
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
if (type === 'Timer') { if (type === 'Timer') {
return apiClient.getLiveTvTimer(id); return apiClient.getLiveTvTimer(id);
@ -109,8 +111,8 @@ import recordingHelper from 'recordingHelper';
item.PlaylistItemId = elem ? elem.getAttribute('data-playlistitemid') : null; item.PlaylistItemId = elem ? elem.getAttribute('data-playlistitemid') : null;
} }
import('itemContextMenu').then(({default: itemContextMenu}) => { import('./itemContextMenu').then((itemContextMenu) => {
window.connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => { ServerConnections.getApiClient(item.ServerId).getCurrentUser().then(user => {
itemContextMenu.show(Object.assign({ itemContextMenu.show(Object.assign({
item: item, item: item,
play: true, play: true,
@ -153,7 +155,7 @@ import recordingHelper from 'recordingHelper';
function showPlayMenu(card, target) { function showPlayMenu(card, target) {
const item = getItemInfoFromCard(card); const item = getItemInfoFromCard(card);
import('playMenu').then(({default: playMenu}) => { import('./playmenu').then((playMenu) => {
playMenu.show({ playMenu.show({
item: item, item: item,
@ -163,9 +165,7 @@ import recordingHelper from 'recordingHelper';
} }
function sendToast(text) { function sendToast(text) {
import('toast').then(({default: toast}) => { toast(text);
toast(text);
});
} }
function executeAction(card, target, action) { function executeAction(card, target, action) {
@ -269,7 +269,7 @@ import recordingHelper from 'recordingHelper';
} }
function addToPlaylist(item) { function addToPlaylist(item) {
import('playlistEditor').then(({default: playlistEditor}) => { import('./playlisteditor/playlisteditor').then(({default: playlistEditor}) => {
new playlistEditor().show({ new playlistEditor().show({
items: [item.Id], items: [item.Id],
serverId: item.ServerId serverId: item.ServerId
@ -279,7 +279,7 @@ import recordingHelper from 'recordingHelper';
} }
function playTrailer(item) { function playTrailer(item) {
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => { apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => {
playbackManager.play({ items: trailers }); playbackManager.play({ items: trailers });
@ -287,23 +287,23 @@ import recordingHelper from 'recordingHelper';
} }
function editItem(item, serverId) { function editItem(item, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const serverId = apiClient.serverInfo().Id; const serverId = apiClient.serverInfo().Id;
if (item.Type === 'Timer') { if (item.Type === 'Timer') {
if (item.ProgramId) { if (item.ProgramId) {
import('recordingCreator').then(({default: recordingCreator}) => { import('./recordingcreator/recordingcreator').then(({default: recordingCreator}) => {
recordingCreator.show(item.ProgramId, serverId).then(resolve, reject); recordingCreator.show(item.ProgramId, serverId).then(resolve, reject);
}); });
} else { } else {
import('recordingEditor').then(({default: recordingEditor}) => { import('./recordingcreator/recordingeditor').then(({default: recordingEditor}) => {
recordingEditor.show(item.Id, serverId).then(resolve, reject); recordingEditor.show(item.Id, serverId).then(resolve, reject);
}); });
} }
} else { } else {
import('metadataEditor').then(({default: metadataEditor}) => { import('./metadataEditor/metadataEditor').then(({default: metadataEditor}) => {
metadataEditor.show(item.Id, serverId).then(resolve, reject); metadataEditor.show(item.Id, serverId).then(resolve, reject);
}); });
} }
@ -397,4 +397,3 @@ export default {
onClick: onClick, onClick: onClick,
getShortcutAttributesHtml: getShortcutAttributesHtml getShortcutAttributesHtml: getShortcutAttributesHtml
}; };

100
src/components/slideshow/slideshow.js
View file

@ -2,16 +2,20 @@
* Image viewer component * Image viewer component
* @module components/slideshow/slideshow * @module components/slideshow/slideshow
*/ */
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import inputManager from 'inputManager'; import inputManager from '../../scripts/inputManager';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import browser from 'browser'; import browser from '../../scripts/browser';
import appHost from 'apphost'; import { appHost } from '../apphost';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'css!./style'; import './style.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import ServerConnections from '../ServerConnections';
// eslint-disable-next-line import/named, import/namespace
import { Swiper } from 'swiper/swiper-bundle.esm';
import 'swiper/swiper-bundle.css';
/** /**
* Name of transition event. * Name of transition event.
@ -84,7 +88,7 @@ function getBackdropImageUrl(item, options, apiClient) {
* @returns {string} URL of the item's image. * @returns {string} URL of the item's image.
*/ */
function getImgUrl(item, user) { function getImgUrl(item, user) {
const apiClient = window.connectionManager.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
const imageOptions = {}; const imageOptions = {};
if (item.BackdropImageTags && item.BackdropImageTags.length) { if (item.BackdropImageTags && item.BackdropImageTags.length) {
@ -300,45 +304,43 @@ export default function (options) {
slides = currentOptions.items; slides = currentOptions.items;
} }
import('swiper').then(({default: Swiper}) => { swiperInstance = new Swiper(dialog.querySelector('.slideshowSwiperContainer'), {
swiperInstance = new Swiper(dialog.querySelector('.slideshowSwiperContainer'), { direction: 'horizontal',
direction: 'horizontal', // Loop is disabled due to the virtual slides option not supporting it.
// Loop is disabled due to the virtual slides option not supporting it. loop: false,
loop: false, zoom: {
zoom: { minRatio: 1,
minRatio: 1, toggle: true
toggle: true },
}, autoplay: !options.interactive,
autoplay: !options.interactive, keyboard: {
keyboard: { enabled: true
enabled: true },
}, preloadImages: true,
preloadImages: true, slidesPerView: 1,
slidesPerView: 1, slidesPerColumn: 1,
slidesPerColumn: 1, initialSlide: options.startIndex || 0,
initialSlide: options.startIndex || 0, speed: 240,
speed: 240, navigation: {
navigation: { nextEl: '.btnSlideshowNext',
nextEl: '.btnSlideshowNext', prevEl: '.btnSlideshowPrevious'
prevEl: '.btnSlideshowPrevious' },
}, // Virtual slides reduce memory consumption for large libraries while allowing preloading of images;
// Virtual slides reduce memory consumption for large libraries while allowing preloading of images; virtual: {
virtual: { slides: slides,
slides: slides, cache: true,
cache: true, renderSlide: getSwiperSlideHtml,
renderSlide: getSwiperSlideHtml, addSlidesBefore: 1,
addSlidesBefore: 1, addSlidesAfter: 1
addSlidesAfter: 1
}
});
swiperInstance.on('autoplayStart', onAutoplayStart);
swiperInstance.on('autoplayStop', onAutoplayStop);
if (useFakeZoomImage) {
swiperInstance.on('zoomChange', onZoomChange);
} }
}); });
swiperInstance.on('autoplayStart', onAutoplayStart);
swiperInstance.on('autoplayStop', onAutoplayStop);
if (useFakeZoomImage) {
swiperInstance.on('zoomChange', onZoomChange);
}
} }
/** /**
@ -431,7 +433,7 @@ export default function (options) {
function download() { function download() {
const imageInfo = getCurrentImageInfo(); const imageInfo = getCurrentImageInfo();
import('fileDownloader').then(({default: fileDownloader}) => { import('../../scripts/fileDownloader').then((fileDownloader) => {
fileDownloader.download([imageInfo]); fileDownloader.download([imageInfo]);
}); });
} }

24
src/components/sortmenu/sortmenu.js
View file

@ -1,13 +1,13 @@
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'css!./../formdialog'; import '../formdialog.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
function onSubmit(e) { function onSubmit(e) {
e.preventDefault(); e.preventDefault();
@ -22,7 +22,7 @@ function initEditor(context, settings) {
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then((scrollHelper) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -44,7 +44,7 @@ function saveValues(context, settingsKey) {
class SortMenu { class SortMenu {
show(options) { show(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('text!./sortmenu.template.html').then(({default: template}) => { import('./sortmenu.template.html').then(({default: template}) => {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
scrollY: false scrollY: false

93
src/components/subtitleeditor/subtitleeditor.js
View file

@ -1,19 +1,22 @@
import appHost from 'apphost'; import { appHost } from '../apphost';
import dialogHelper from 'dialogHelper'; import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import * as userSettings from 'userSettings'; import * as userSettings from '../../scripts/settings/userSettings';
import loading from 'loading'; import loading from '../loading/loading';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import dom from 'dom'; import dom from '../../scripts/dom';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'listViewStyle'; import '../listview/listview.css';
import 'paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import 'css!./../formdialog'; import '../formdialog.css';
import 'material-icons'; import 'material-design-icons-iconfont';
import 'css!./subtitleeditor'; import './subtitleeditor.css';
import 'emby-button'; import '../../elements/emby-button/emby-button';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
import confirm from '../confirm/confirm';
let currentItem; let currentItem;
let hasChanges; let hasChanges;
@ -21,7 +24,7 @@ let hasChanges;
function downloadRemoteSubtitles(context, id) { function downloadRemoteSubtitles(context, id) {
const url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id; const url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
apiClient.ajax({ apiClient.ajax({
type: 'POST', type: 'POST',
@ -30,9 +33,7 @@ function downloadRemoteSubtitles(context, id) {
}).then(function () { }).then(function () {
hasChanges = true; hasChanges = true;
import('toast').then(({default: toast}) => { toast(globalize.translate('MessageDownloadQueued'));
toast(globalize.translate('MessageDownloadQueued'));
});
focusManager.autoFocus(context); focusManager.autoFocus(context);
}); });
@ -41,31 +42,29 @@ function downloadRemoteSubtitles(context, id) {
function deleteLocalSubtitle(context, index) { function deleteLocalSubtitle(context, index) {
const msg = globalize.translate('MessageAreYouSureDeleteSubtitles'); const msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
import('confirm').then(({default: confirm}) => { confirm({
confirm({
title: globalize.translate('ConfirmDeletion'), title: globalize.translate('ConfirmDeletion'),
text: msg, text: msg,
confirmText: globalize.translate('Delete'), confirmText: globalize.translate('Delete'),
primary: 'delete' primary: 'delete'
}).then(function () {
loading.show();
const itemId = currentItem.Id;
const url = 'Videos/' + itemId + '/Subtitles/' + index;
const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
apiClient.ajax({
type: 'DELETE',
url: apiClient.getUrl(url)
}).then(function () { }).then(function () {
loading.show(); hasChanges = true;
reload(context, apiClient, itemId);
const itemId = currentItem.Id;
const url = 'Videos/' + itemId + '/Subtitles/' + index;
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({
type: 'DELETE',
url: apiClient.getUrl(url)
}).then(function () {
hasChanges = true;
reload(context, apiClient, itemId);
});
}); });
}); });
} }
@ -243,7 +242,7 @@ function searchForSubtitles(context, language) {
loading.show(); loading.show();
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId); const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
const url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language); const url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
apiClient.getJSON(url).then(function (results) { apiClient.getJSON(url).then(function (results) {
@ -329,7 +328,7 @@ function showDownloadOptions(button, context, subtitleId) {
id: 'download' id: 'download'
}); });
import('actionsheet').then(({default: actionsheet}) => { import('../actionSheet/actionSheet').then((actionsheet) => {
actionsheet.show({ actionsheet.show({
items: items, items: items,
positionTo: button positionTo: button
@ -347,7 +346,7 @@ function showDownloadOptions(button, context, subtitleId) {
} }
function centerFocus(elem, horiz, on) { function centerFocus(elem, horiz, on) {
import('scrollHelper').then(({default: scrollHelper}) => { import('../../scripts/scrollHelper').then(({default: scrollHelper}) => {
const fn = on ? 'on' : 'off'; const fn = on ? 'on' : 'off';
scrollHelper.centerFocus[fn](elem, horiz); scrollHelper.centerFocus[fn](elem, horiz);
}); });
@ -356,7 +355,7 @@ function centerFocus(elem, horiz, on) {
function showEditorInternal(itemId, serverId, template) { function showEditorInternal(itemId, serverId, template) {
hasChanges = false; hasChanges = false;
const apiClient = window.connectionManager.getApiClient(serverId); const apiClient = ServerConnections.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
const dialogOptions = { const dialogOptions = {
removeOnClose: true, removeOnClose: true,
@ -431,7 +430,7 @@ function showEditor(itemId, serverId) {
loading.show(); loading.show();
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('text!./subtitleeditor.template.html').then(({default: template}) => { import('./subtitleeditor.template.html').then(({default: template}) => {
showEditorInternal(itemId, serverId, template).then(resolve, reject); showEditorInternal(itemId, serverId, template).then(resolve, reject);
}); });
}); });

48
src/components/subtitlesettings/subtitlesettings.js
View file

@ -1,20 +1,22 @@
import globalize from 'globalize'; import globalize from '../../scripts/globalize';
import appHost from 'apphost'; import { appHost } from '../apphost';
import appSettings from 'appSettings'; import appSettings from '../../scripts/settings/appSettings';
import focusManager from 'focusManager'; import focusManager from '../focusManager';
import layoutManager from 'layoutManager'; import layoutManager from '../layoutManager';
import loading from 'loading'; import loading from '../loading/loading';
import subtitleAppearanceHelper from 'subtitleAppearanceHelper'; import subtitleAppearanceHelper from './subtitleappearancehelper';
import settingsHelper from 'settingsHelper'; import settingsHelper from '../settingshelper';
import dom from 'dom'; import dom from '../../scripts/dom';
import events from 'events'; import { Events } from 'jellyfin-apiclient';
import 'listViewStyle'; import '../listview/listview.css';
import 'emby-select'; import '../../elements/emby-select/emby-select';
import 'emby-slider'; import '../../elements/emby-slider/emby-slider';
import 'emby-input'; import '../../elements/emby-input/emby-input';
import 'emby-checkbox'; import '../../elements/emby-checkbox/emby-checkbox';
import 'flexStyles'; import '../../assets/css/flexstyles.scss';
import 'css!./subtitlesettings'; import './subtitlesettings.css';
import ServerConnections from '../ServerConnections';
import toast from '../toast/toast';
/** /**
* Subtitle settings. * Subtitle settings.
@ -87,12 +89,10 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () { saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () {
loading.hide(); loading.hide();
if (enableSaveConfirmation) { if (enableSaveConfirmation) {
import('toast').then(({default: toast}) => { toast(globalize.translate('SettingsSaved'));
toast(globalize.translate('SettingsSaved'));
});
} }
events.trigger(instance, 'saved'); Events.trigger(instance, 'saved');
}, function () { }, function () {
loading.hide(); loading.hide();
}); });
@ -158,7 +158,7 @@ function hideSubtitlePreview(persistent) {
} }
function embed(options, self) { function embed(options, self) {
import('text!./subtitlesettings.template.html').then(({default: template}) => { import('./subtitlesettings.template.html').then(({default: template}) => {
options.element.classList.add('subtitlesettings'); options.element.classList.add('subtitlesettings');
options.element.innerHTML = globalize.translateHtml(template, 'core'); options.element.innerHTML = globalize.translateHtml(template, 'core');
@ -231,7 +231,7 @@ export class SubtitleSettings {
loading.show(); loading.show();
const userId = self.options.userId; const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(function (user) { apiClient.getUser(userId).then(function (user) {
@ -255,7 +255,7 @@ export class SubtitleSettings {
onSubmit(e) { onSubmit(e) {
const self = this; const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId); const apiClient = ServerConnections.getApiClient(self.options.serverId);
const userId = self.options.userId; const userId = self.options.userId;
const userSettings = self.options.userSettings; const userSettings = self.options.userSettings;

Some files were not shown because too many files have changed in this diff Show more