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

stub out xml tv class

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-24 17:44:25 -04:00
parent 256b44764f
commit 3226bd017c
4 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dashboard-ui/apiclient/apiclient.js
View file

@ -2617,8 +2617,9 @@
*/ */
self.authenticateUserByName = function (name, password) { self.authenticateUserByName = function (name, password) {
var deferred = DeferredBuilder.Deferred();
if (!name) { if (!name) {
var deferred = DeferredBuilder.Deferred();
deferred.reject(); deferred.reject();
return deferred.promise(); return deferred.promise();
} }
@ -2630,7 +2631,7 @@
Username: name Username: name
}; };
return self.ajax({ self.ajax({
type: "POST", type: "POST",
url: url, url: url,
data: JSON.stringify(postData), data: JSON.stringify(postData),
@ -2639,8 +2640,18 @@
}).done(function (result) { }).done(function (result) {
Events.trigger(self, 'authenticated', [result]); if (self.onAuthenticated) {
self.onAuthenticated(self, result);
}
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.reject();
}); });
return deferred.promise();
}; };
/** /**

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

@ -176,9 +176,9 @@
existingServer.ManualAddress = apiClient.serverAddress(); existingServer.ManualAddress = apiClient.serverAddress();
apiClient.serverInfo(existingServer); apiClient.serverInfo(existingServer);
Events.on(apiClient, 'authenticated', function (e, result) { apiClient.onAuthenticated = function (instance, result) {
onAuthenticated(this, result, {}, true); onAuthenticated(instance, result, {}, true);
}); };
if (!existingServers.length) { if (!existingServers.length) {
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
@ -235,9 +235,9 @@
apiClient.serverInfo(server); apiClient.serverInfo(server);
Events.on(apiClient, 'authenticated', function (e, result) { apiClient.onAuthenticated = function (instance, result) {
onAuthenticated(this, result, {}, true); onAuthenticated(instance, result, {}, true);
}); };
Events.trigger(self, 'apiclientcreated', [apiClient]); Events.trigger(self, 'apiclientcreated', [apiClient]);
} }

4
dashboard-ui/apiclient/credentials.js
View file

@ -18,9 +18,7 @@
Logger.log('credentials initialized with: ' + json); Logger.log('credentials initialized with: ' + json);
credentials = JSON.parse(json); credentials = JSON.parse(json);
credentials.Servers = credentials.Servers || credentials.servers || []; credentials.Servers = credentials.Servers || [];
credentials.servers = null;
} }
} }

11
dashboard-ui/scripts/livetvguideprovider-scd.js
View file

@ -56,6 +56,15 @@
function submitListingsForm(page) { function submitListingsForm(page) {
var selectedListingsId = $('#selectListing', page).val();
if (!selectedListingsId) {
Dashboard.alert({
message: Globalize.translate('ErrorPleaseSelectLineup')
});
return;
}
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var id = providerId; var id = providerId;
@ -68,7 +77,7 @@
info.ZipCode = $('#txtZipCode', page).val(); info.ZipCode = $('#txtZipCode', page).val();
info.Country = $('#selectCountry', page).val(); info.Country = $('#selectCountry', page).val();
info.ListingsId = $('#selectListing', page).val(); info.ListingsId = selectedListingsId;
ApiClient.ajax({ ApiClient.ajax({
type: "POST", type: "POST",