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 remote-tracking branch 'upstream/master' into fix-sonar-issues

Browse source
This commit is contained in:
Bill Thornton 2022-10-04 10:00:37 -04:00
commit 7d2850f6a3
67 changed files with 527 additions and 627 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -800,13 +800,11 @@ import confirm from '../../components/confirm/confirm';
});
}
if (ApiClient.isMinServerVersion('3.4.1.25')) {
if (!page.serverActivityLog) {
page.serverActivityLog = new ActivityLog({
serverId: ApiClient.serverId(),
element: page.querySelector('.serverActivityItems')
});
}
if (!page.serverActivityLog) {
page.serverActivityLog = new ActivityLog({
serverId: ApiClient.serverId(),
element: page.querySelector('.serverActivityItems')
});
}
refreshActiveRecordings(view, apiClient);

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

@ -1,6 +1,6 @@
import escapeHtml from 'escape-html';
import { playbackManager } from '../../../components/playback/playbackmanager';
import SyncPlay from '../../../components/syncPlay/core';
import SyncPlay from '../../../plugins/syncPlay/core';
import browser from '../../../scripts/browser';
import dom from '../../../scripts/dom';
import inputManager from '../../../scripts/inputManager';