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

update javascript connection manager to latest feature set

Browse source
This commit is contained in:
Luke Pulverenti 2015-02-15 19:33:06 -05:00
parent 12e5298463
commit f7bb1a627d
11 changed files with 494 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1026,7 +1026,8 @@
AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
deviceId: ApiClient.deviceId(),
Static: false,
mediaSourceId: mediaSource.Id
mediaSourceId: mediaSource.Id,
api_key: ApiClient.accessToken()
};
if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
@ -1147,7 +1148,8 @@
var textStream = textStreams[i];
var textStreamUrl = ApiClient.getUrl('Videos/' + item.Id + '/' + mediaSource.Id + '/Subtitles/' + textStream.Index + '/Stream.vtt', {
startPositionTicks: (startPosition || 0)
startPositionTicks: (startPosition || 0),
api_key: ApiClient.accessToken()
});
var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';

3
dashboard-ui/scripts/mediaplayer.js
View file

@ -1293,7 +1293,8 @@
audioBitrate: 128000,
StartTimeTicks: startPositionTicks,
mediaSourceId: mediaSource.Id,
deviceId: ApiClient.deviceId()
deviceId: ApiClient.deviceId(),
api_key: ApiClient.accessToken()
};
var sourceContainer = (mediaSource.Container || '').toLowerCase();

2
dashboard-ui/scripts/selectserver.js
View file

@ -337,7 +337,7 @@
Dashboard.showLoadingMsg();
ConnectionManager.getServers().done(function (servers) {
ConnectionManager.getAvailableServers().done(function (servers) {
renderServers(page, servers);

6
dashboard-ui/scripts/site.js
View file

@ -1336,7 +1336,7 @@ var Dashboard = {
SupportsPersistentIdentifier: false
};
window.ConnectionManager = new MediaBrowser.ConnectionManager(jQuery, Logger, credentialProvider, appName, appVersion, deviceName, deviceId, capabilities);
window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, appName, appVersion, deviceName, deviceId, capabilities);
if (Dashboard.isConnectMode()) {
@ -1347,7 +1347,7 @@ var Dashboard = {
if (!Dashboard.isServerlessPage()) {
if (Dashboard.serverAddress() && Dashboard.getCurrentUserId() && Dashboard.getAccessToken()) {
window.ApiClient = new MediaBrowser.ApiClient(jQuery, Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities);
window.ApiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities);
ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken());
@ -1362,7 +1362,7 @@ var Dashboard = {
} else {
window.ApiClient = new MediaBrowser.ApiClient(jQuery, Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities);
window.ApiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities);
ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken());