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 delete server

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-03 12:54:01 -04:00
parent c65b8a2cf4
commit 231cb007b1
3 changed files with 28 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

37
dashboard-ui/apiclient/connectionmanager.js
View file

@ -1232,40 +1232,33 @@
self.deleteServer = function (serverId) { self.deleteServer = function (serverId) {
var credentials = credentialProvider.credentials(); var connectToken = self.connectToken();
var serverInfo = credentials.Servers = credentials.Servers.filter(function (s) { if (!serverId) {
return s.ConnectServerId == serverId; throw new Error("null serverId");
}); }
var deferred = DeferredBuilder.Deferred();
function onDone() { function onDone() {
var credentials = credentialProvider.credentials();
credentials = credentialProvider.credentials();
credentials.Servers = credentials.Servers.filter(function (s) { credentials.Servers = credentials.Servers.filter(function (s) {
return s.ConnectServerId != serverId; return s.ConnectServerId != serverId;
}); });
credentialProvider.credentials(credentials); credentialProvider.credentials(credentials);
deferred.resolve();
} }
if (serverInfo.ExchangeToken) { if (!connectToken || !self.connectUserId()) {
onDone();
var connectToken = self.connectToken(); return deferred.promise();
if (!serverId) {
throw new Error("null serverId");
}
if (!connectToken) {
throw new Error("null connectToken");
}
if (!self.connectUserId()) {
throw new Error("null connectUserId");
} }
var url = "https://connect.mediabrowser.tv/service/serverAuthorizations?serverId=" + serverId + "&userId=" + self.connectUserId(); var url = "https://connect.mediabrowser.tv/service/serverAuthorizations?serverId=" + serverId + "&userId=" + self.connectUserId();
return HttpClient.send({ HttpClient.send({
type: "DELETE", type: "DELETE",
url: url, url: url,
headers: { headers: {
@ -1275,13 +1268,7 @@
}).always(onDone); }).always(onDone);
} else {
onDone();
var deferred = DeferredBuilder.Deferred();
deferred.resolve();
return deferred.promise(); return deferred.promise();
}
}; };
self.rejectServer = function (serverId) { self.rejectServer = function (serverId) {

6
dashboard-ui/bower_components/iron-resizable-behavior/.bower.json vendored
View file

@ -27,14 +27,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-resizable-behavior", "homepage": "https://github.com/PolymerElements/iron-resizable-behavior",
"_release": "1.0.2", "_release": "1.0.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.2", "tag": "v1.0.2",
"commit": "85de8ba28be2bf17c81d6436ef1119022b003674" "commit": "85de8ba28be2bf17c81d6436ef1119022b003674"
}, },
"_source": "git://github.com/polymerelements/iron-resizable-behavior.git", "_source": "git://github.com/PolymerElements/iron-resizable-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-resizable-behavior" "_originalSource": "PolymerElements/iron-resizable-behavior"
} }

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

@ -1,6 +1,5 @@
(function () { (function () {
var serverList = [];
function connectToServer(page, server) { function connectToServer(page, server) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -110,8 +109,6 @@
function renderServers(page, servers) { function renderServers(page, servers) {
serverList = servers;
if (servers.length) { if (servers.length) {
$('.noServersMessage', page).hide(); $('.noServersMessage', page).hide();
} else { } else {
@ -182,12 +179,7 @@
Dashboard.hideModalLoadingMsg(); Dashboard.hideModalLoadingMsg();
// Just re-render the servers without discovering them again loadPage(page);
// If we re-discover then the one they deleted may just come back
var newServerList = serverList.filter(function(s){
return s.Id != id;
});
renderServers(page, newServerList);
}).fail(function () { }).fail(function () {