1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

support api without /mediabrowser

This commit is contained in:
Luke Pulverenti 2015-01-17 14:30:23 -05:00
parent 3ee2a15358
commit 248c09b642
4 changed files with 20 additions and 19 deletions

View file

@ -82,17 +82,8 @@
</div>
</div>
<div data-role="collapsible" data-collapsed="true" style="margin-top: 1em;">
<h3>${HeaderLinks}</h3>
<div>
<p><a href="http://mediabrowser.tv/community" target="_blank">${LinkCommunity}</a></p>
<p><a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank">${LinkGithub}</a></p>
<p><a href="../swagger-ui/index.html" target="_blank">${LinkApiDocumentation}</a></p>
</div>
</div>
<div data-role="collapsible" data-collapsed="true">
<h3>${HeaderSystemPaths}</h3>
<h3>${HeaderPaths}</h3>
<div>
<p>
<b>${LabelCache}</b><br />
@ -173,6 +164,16 @@
</div>
</div>
</div>
<div style="margin-top:70px;text-align:center;">
<div style="height:1px;" class="ui-bar-inherit"></div>
<div style="margin-top:1em;">
<a href="http://mediabrowser.tv" target="_blank" style="margin-left:1em;text-decoration:none;">Media Browser</a>
<a href="http://mediabrowser.tv/community" target="_blank" style="margin-left:1em;text-decoration:none;">${LinkCommunity}</a>
<a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank" style="margin-left:1em;text-decoration:none;">${LinkGithub}</a>
<a href="../swagger-ui/index.html" target="_blank" style="margin-left:1em;text-decoration:none;">${LinkApi}</a>
</div>
</div>
</div>
</div>
</div>

View file

@ -235,7 +235,7 @@
if (mediaType == 'Audio') {
url = serverAddress + '/mediabrowser/audio/' + itemId + '/stream.' + mediaSourceInfo.streamContainer;
url = serverAddress + '/audio/' + itemId + '/stream.' + mediaSourceInfo.streamContainer;
url += '?mediasourceid=' + mediaSourceInfo.mediaSource.Id;
@ -263,10 +263,10 @@
else if (mediaType == 'Video') {
if (mediaSourceInfo.isStatic) {
url = serverAddress + '/mediabrowser/videos/' + itemId + '/stream.' + mediaSourceInfo.streamContainer + '?static=true';
url = serverAddress + '/videos/' + itemId + '/stream.' + mediaSourceInfo.streamContainer + '?static=true';
}
else {
url = serverAddress + '/mediabrowser/videos/' + itemId + '/stream.' + mediaSourceInfo.streamContainer + '?static=false';
url = serverAddress + '/videos/' + itemId + '/stream.' + mediaSourceInfo.streamContainer + '?static=false';
}
url += '&maxaudiochannels=' + codecLimits.maxVideoAudioChannels;

View file

@ -66,7 +66,7 @@
return $.ajax({
type: "GET",
url: url + "/mediabrowser/system/info/public",
url: url + "/system/info/public",
dataType: "json",
timeout: timeout || 15000
@ -268,7 +268,7 @@
var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress;
url += "/mediabrowser/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
url += "/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
return $.ajax({
type: "GET",
@ -299,7 +299,7 @@
$.ajax({
type: "GET",
url: url + "/mediabrowser/system/info",
url: url + "/system/info",
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.AccessToken
@ -314,7 +314,7 @@
$.ajax({
type: "GET",
url: url + "/mediabrowser/users/" + server.UserId,
url: url + "/users/" + server.UserId,
dataType: "json",
headers: {
"X-MediaBrowser-Token": server.AccessToken

View file

@ -49,7 +49,7 @@
self.apiPrefix = function () {
return "/mediabrowser";
return "";
};
self.serverInfo = function (info) {
@ -189,7 +189,7 @@
$.ajax({
type: "GET",
url: url + "/mediabrowser/system/info/public",
url: url + "/system/info/public",
dataType: "json",
timeout: 15000