milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix apiclient imports

Browse source
This commit is contained in:
Bill Thornton 2020-09-08 02:05:02 -04:00 • committed by vitorsemeano
parent 7d9208e951
commit a71b0314d4
71 changed files with 424 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/controllers/dashboard/dashboard.js
View file

@ -1,5 +1,5 @@
import datetime from '../../scripts/datetime';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import itemHelper from '../../components/itemHelper';
import serverNotifications from '../../scripts/serverNotifications';
import dom from '../../scripts/dom';
@ -799,13 +799,13 @@ import taskButton from '../../scripts/taskbutton';
loading.show();
pollForInfo(page, apiClient);
DashboardPage.startInterval(apiClient);
events.on(serverNotifications, 'RestartRequired', onRestartRequired);
events.on(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
events.on(serverNotifications, 'ServerRestarting', onServerRestarting);
events.on(serverNotifications, 'PackageInstalling', onPackageInstalling);
events.on(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted);
events.on(serverNotifications, 'Sessions', onSessionsUpdate);
events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
Events.on(serverNotifications, 'RestartRequired', onRestartRequired);
Events.on(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
Events.on(serverNotifications, 'ServerRestarting', onServerRestarting);
Events.on(serverNotifications, 'PackageInstalling', onPackageInstalling);
Events.on(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted);
Events.on(serverNotifications, 'Sessions', onSessionsUpdate);
Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
DashboardPage.lastAppUpdateCheck = null;
reloadSystemInfo(page, ApiClient);
@ -839,13 +839,13 @@ import taskButton from '../../scripts/taskbutton';
const apiClient = ApiClient;
const page = this;
events.off(serverNotifications, 'RestartRequired', onRestartRequired);
events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
events.off(serverNotifications, 'PackageInstalling', onPackageInstalling);
events.off(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted);
events.off(serverNotifications, 'Sessions', onSessionsUpdate);
events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
Events.off(serverNotifications, 'RestartRequired', onRestartRequired);
Events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
Events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
Events.off(serverNotifications, 'PackageInstalling', onPackageInstalling);
Events.off(serverNotifications, 'PackageInstallationCompleted', onPackageInstallationCompleted);
Events.off(serverNotifications, 'Sessions', onSessionsUpdate);
Events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
if (apiClient) {
DashboardPage.stopInterval(apiClient);

6
src/controllers/dashboard/scheduledtasks/scheduledtasks.js
View file

@ -1,6 +1,6 @@
import 'jquery';
import loading from '../../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import globalize from '../../../scripts/globalize';
import serverNotifications from '../../../scripts/serverNotifications';
import { formatDistance, formatDistanceToNow } from 'date-fns';
@ -177,7 +177,7 @@ import '../../../elements/emby-button/emby-button';
});
view.addEventListener('viewbeforehide', function() {
events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
Events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
stopInterval();
});
@ -185,7 +185,7 @@ import '../../../elements/emby-button/emby-button';
loading.show();
startInterval();
reloadList(view);
events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
Events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
});
}

10
src/controllers/itemDetails/index.js
View file

@ -2,7 +2,7 @@ import { appHost } from '../../components/apphost';
import loading from '../../components/loading/loading';
import { appRouter } from '../../components/appRouter';
import layoutManager from '../../components/layoutManager';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import * as userSettings from '../../scripts/settings/userSettings';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import datetime from '../../scripts/datetime';
@ -2048,12 +2048,12 @@ export default function (view, params) {
reload(self, page, params);
}
events.on(apiClient, 'message', onWebSocketMessage);
events.on(playbackManager, 'playerchange', onPlayerChange);
Events.on(apiClient, 'message', onWebSocketMessage);
Events.on(playbackManager, 'playerchange', onPlayerChange);
});
view.addEventListener('viewbeforehide', function () {
events.off(apiClient, 'message', onWebSocketMessage);
events.off(playbackManager, 'playerchange', onPlayerChange);
Events.off(apiClient, 'message', onWebSocketMessage);
Events.off(playbackManager, 'playerchange', onPlayerChange);
libraryMenu.setTransparentMenu(false);
});
view.addEventListener('viewdestroy', function () {

4
src/controllers/livetv/livetvchannels.js
View file

@ -2,7 +2,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
import imageLoader from '../../components/images/imageLoader';
import libraryBrowser from '../../scripts/libraryBrowser';
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import * as userSettings from '../../scripts/settings/userSettings';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
@ -97,7 +97,7 @@ export default function (view, params, tabContent) {
mode: 'livetvchannels',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
reloadItems(context);
});
filterDialog.show();

4
src/controllers/livetvguideprovider.js
View file

@ -1,4 +1,4 @@
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import loading from '../components/loading/loading';
import globalize from '../scripts/globalize';
@ -11,7 +11,7 @@ function init(page, type, providerId) {
import(url).then(({default: factory}) => {
const instance = new factory(page, providerId, {});
events.on(instance, 'submitted', onListingsSubmitted);
Events.on(instance, 'submitted', onListingsSubmitted);
instance.init();
});
}

4
src/controllers/movies/movies.js
View file

@ -1,6 +1,6 @@
import loading from '../../components/loading/loading';
import * as userSettings from '../../scripts/settings/userSettings';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
import listView from '../../components/listview/listview';
@ -284,7 +284,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'movies',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', () => {
Events.on(filterDialog, 'filterchange', () => {
query.StartIndex = 0;
itemsContainer.refreshItems();
});

4
src/controllers/movies/moviesrecommended.js
View file

@ -1,5 +1,5 @@
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import layoutManager from '../../components/layoutManager';
import inputManager from '../../scripts/inputManager';
import * as userSettings from '../../scripts/settings/userSettings';
@ -404,7 +404,7 @@ import '../../elements/emby-button/emby-button';
}
}
events.on(playbackManager, 'playbackstop', onPlaybackStop);
Events.on(playbackManager, 'playbackstop', onPlaybackStop);
inputManager.on(window, onInputCommand);
});
view.addEventListener('viewbeforehide', function () {

4
src/controllers/movies/movietrailers.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
@ -198,7 +198,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'movies',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems();
});

5
src/controllers/music/musicalbums.js
View file

@ -1,6 +1,6 @@
import { playbackManager } from '../../components/playback/playbackmanager';
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import AlphaPicker from '../../components/alphaPicker/alphaPicker';
@ -210,8 +210,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'albums',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
getQuery().StartIndex = 0;
reloadItems(tabContent);
});

4
src/controllers/music/musicartists.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
@ -182,7 +182,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: this.mode,
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});

4
src/controllers/music/songs.js
View file

@ -1,5 +1,5 @@
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';
@ -137,7 +137,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'songs',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});

48
src/controllers/playback/video/index.js
View file

@ -6,7 +6,7 @@ import datetime from '../../../scripts/datetime';
import itemHelper from '../../../components/itemHelper';
import mediaInfo from '../../../components/mediainfo/mediainfo';
import focusManager from '../../../components/focusManager';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { ConnectionManager, Events } from 'jellyfin-apiclient';
import browser from '../../../scripts/browser';
import globalize from '../../../scripts/globalize';
import { appHost } from '../../../components/apphost';
@ -540,16 +540,16 @@ import '../../../assets/css/videoosd.css';
onStateChanged.call(player, {
type: 'init'
}, state);
events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'playbackstop', onPlaybackStopped);
events.on(player, 'volumechange', onVolumeChanged);
events.on(player, 'pause', onPlayPauseStateChanged);
events.on(player, 'unpause', onPlayPauseStateChanged);
events.on(player, 'timeupdate', onTimeUpdate);
events.on(player, 'fullscreenchange', updateFullscreenIcon);
events.on(player, 'mediastreamschange', onMediaStreamsChanged);
events.on(player, 'beginFetch', onBeginFetch);
events.on(player, 'endFetch', onEndFetch);
Events.on(player, 'playbackstart', onPlaybackStart);
Events.on(player, 'playbackstop', onPlaybackStopped);
Events.on(player, 'volumechange', onVolumeChanged);
Events.on(player, 'pause', onPlayPauseStateChanged);
Events.on(player, 'unpause', onPlayPauseStateChanged);
Events.on(player, 'timeupdate', onTimeUpdate);
Events.on(player, 'fullscreenchange', updateFullscreenIcon);
Events.on(player, 'mediastreamschange', onMediaStreamsChanged);
Events.on(player, 'beginFetch', onBeginFetch);
Events.on(player, 'endFetch', onEndFetch);
resetUpNextDialog();
if (player.isFetching) {
@ -564,14 +564,14 @@ import '../../../assets/css/videoosd.css';
const player = currentPlayer;
if (player) {
events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'playbackstop', onPlaybackStopped);
events.off(player, 'volumechange', onVolumeChanged);
events.off(player, 'pause', onPlayPauseStateChanged);
events.off(player, 'unpause', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate);
events.off(player, 'fullscreenchange', updateFullscreenIcon);
events.off(player, 'mediastreamschange', onMediaStreamsChanged);
Events.off(player, 'playbackstart', onPlaybackStart);
Events.off(player, 'playbackstop', onPlaybackStopped);
Events.off(player, 'volumechange', onVolumeChanged);
Events.off(player, 'pause', onPlayPauseStateChanged);
Events.off(player, 'unpause', onPlayPauseStateChanged);
Events.off(player, 'timeupdate', onTimeUpdate);
Events.off(player, 'fullscreenchange', updateFullscreenIcon);
Events.off(player, 'mediastreamschange', onMediaStreamsChanged);
currentPlayer = null;
}
}
@ -623,7 +623,7 @@ import '../../../assets/css/videoosd.css';
player: player,
nextItem: nextItem
});
events.on(currentUpNextDialog, 'hide', onUpNextHidden);
Events.on(currentUpNextDialog, 'hide', onUpNextHidden);
}, onUpNextHidden);
}
});
@ -1299,7 +1299,7 @@ import '../../../assets/css/videoosd.css';
});
view.addEventListener('viewshow', function (e) {
try {
events.on(playbackManager, 'playerchange', onPlayerChange);
Events.on(playbackManager, 'playerchange', onPlayerChange);
bindToPlayer(playbackManager.getCurrentPlayer());
/* eslint-disable-next-line compat/compat */
dom.addEventListener(document, window.PointerEvent ? 'pointermove' : 'mousemove', onPointerMove, {
@ -1384,7 +1384,7 @@ import '../../../assets/css/videoosd.css';
passive: true
});
inputManager.off(window, onInputCommand);
events.off(playbackManager, 'playerchange', onPlayerChange);
Events.off(playbackManager, 'playerchange', onPlayerChange);
releaseCurrentPlayer();
});
view.querySelector('.btnFullscreen').addEventListener('click', function () {
@ -1555,8 +1555,8 @@ import '../../../assets/css/videoosd.css';
preventDefaultOnMove: true,
ignoreTagNames: ['BUTTON', 'INPUT', 'TEXTAREA']
});
events.on(self.touchHelper, 'swipeup', onVerticalSwipe);
events.on(self.touchHelper, 'swipedown', onVerticalSwipe);
Events.on(self.touchHelper, 'swipeup', onVerticalSwipe);
Events.on(self.touchHelper, 'swipedown', onVerticalSwipe);
});
})();
}

4
src/controllers/searchpage.js
View file

@ -1,6 +1,6 @@
import SearchFields from '../components/search/searchfields';
import SearchResults from '../components/search/searchresults';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
export default function (view, params) {
function onSearch(e, value) {
@ -19,7 +19,7 @@ export default function (view, params) {
parentId: params.parentId,
collectionType: params.collectionType
});
events.on(self.searchFields, 'search', onSearch);
Events.on(self.searchFields, 'search', onSearch);
}
});
view.addEventListener('viewdestroy', function () {

4
src/controllers/shows/episodes.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';
@ -177,7 +177,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'episodes',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
reloadItems(tabContent);
});
filterDialog.show();

10
src/controllers/shows/tvrecommended.js
View file

@ -1,5 +1,5 @@
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import inputManager from '../../scripts/inputManager';
import libraryMenu from '../../scripts/libraryMenu';
import layoutManager from '../../components/layoutManager';
@ -374,14 +374,14 @@ import '../../elements/emby-button/emby-button';
}
}
events.on(playbackManager, 'playbackstop', onPlaybackStop);
events.on(ApiClient, 'message', onWebSocketMessage);
Events.on(playbackManager, 'playbackstop', onPlaybackStop);
Events.on(ApiClient, 'message', onWebSocketMessage);
inputManager.on(window, onInputCommand);
});
view.addEventListener('viewbeforehide', function (e) {
inputManager.off(window, onInputCommand);
events.off(playbackManager, 'playbackstop', onPlaybackStop);
events.off(ApiClient, 'message', onWebSocketMessage);
Events.off(playbackManager, 'playbackstop', onPlaybackStop);
Events.off(ApiClient, 'message', onWebSocketMessage);
});
view.addEventListener('viewdestroy', function (e) {
tabControllers.forEach(function (t) {

4
src/controllers/shows/tvshows.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import { events } from 'jellyfin-apiclient';
import { Events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';
@ -220,7 +220,7 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
mode: 'series',
serverId: ApiClient.serverId()
});
events.on(filterDialog, 'filterchange', function () {
Events.on(filterDialog, 'filterchange', function () {
getQuery(tabContent).StartIndex = 0;
reloadItems(tabContent);
});