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

add metadata editor info endpoint

Browse source
This commit is contained in:
Luke Pulverenti 2014-12-21 00:57:06 -05:00
parent 8a641ab831
commit 723e217a6f
4 changed files with 100 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -59,7 +59,7 @@
}
function tryConnect(url) {
function tryConnect(url, timeout) {
return $.ajax({
@ -67,7 +67,7 @@
url: url + "/mediabrowser/system/info/public",
dataType: "json",
timeout: 15000
timeout: timeout || 15000
});
}
@ -704,7 +704,7 @@
//onLocalTestDone();
// Try to connect to the local address
tryConnect(server.LocalAddress).done(function (result) {
tryConnect(server.LocalAddress, 5000).done(function (result) {
onLocalTestDone(result, MediaBrowser.ConnectionMode.Local);
}).fail(function () {
onLocalTestDone();