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

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -45,7 +45,7 @@
url: apiClient.getUrl('Startup/User'),
dataType: 'json'
}).done(onUpdateUserComplete).fail(function () {
}).then(onUpdateUserComplete, function () {
var msgKey = form.querySelector('#txtConnectUserName').value ? 'ErrorAddingEmbyConnectAccount' : 'DefaultErrorMessage';
@ -77,7 +77,7 @@
var apiClient = getApiClient();
apiClient.getJSON(apiClient.getUrl('Startup/User')).done(function (user) {
apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) {
page.querySelector('#txtUsername').value = user.Name;
page.querySelector('#txtConnectUserName').value = user.ConnectUserName;