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

merge from dev

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,11 +14,11 @@
var promise1 = getProfile();
var promise2 = ApiClient.getUsers();
$.when(promise1, promise2).done(function (response1, response2) {
Promise.all([promise1, promise2]).then(function (responses) {
currentProfile = response1[0];
currentProfile = responses[0];
renderProfile(page, currentProfile, response2[0]);
renderProfile(page, currentProfile, responses[1]);
Dashboard.hideLoadingMsg();
@ -864,7 +864,7 @@
url: ApiClient.getUrl("Dlna/Profiles/" + id),
data: JSON.stringify(profile),
contentType: "application/json"
}).done(function () {
}).then(function () {
Dashboard.alert('Settings saved.');
});
@ -876,7 +876,7 @@
url: ApiClient.getUrl("Dlna/Profiles"),
data: JSON.stringify(profile),
contentType: "application/json"
}).done(function () {
}).then(function () {
Dashboard.navigate('dlnaprofiles.html');