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

16
dashboard-ui/scripts/userprofilespage.js
View file

@ -37,7 +37,7 @@
if (result) {
Dashboard.showLoadingMsg();
ApiClient.deleteUser(id).done(function () {
ApiClient.deleteUser(id).then(function () {
loadData(page);
});
@ -332,7 +332,7 @@
})
}).done(function () {
}).then(function () {
loadData(page);
@ -343,17 +343,17 @@
Dashboard.showLoadingMsg();
ApiClient.getUsers().done(function (users) {
ApiClient.getUsers().then(function (users) {
renderUsers(page, users);
Dashboard.hideLoadingMsg();
});
ApiClient.getJSON(ApiClient.getUrl('Connect/Pending')).done(function (pending) {
ApiClient.getJSON(ApiClient.getUrl('Connect/Pending')).then(function (pending) {
renderPendingGuests(page, pending);
});
ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })).done(function (result) {
ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })).then(function (result) {
renderLibrarySharingList(page, result);
});
@ -363,7 +363,7 @@
Dashboard.showLoadingMsg();
ApiClient.getJSON(ApiClient.getUrl("Channels", {})).done(function (channelsResult) {
ApiClient.getJSON(ApiClient.getUrl("Channels", {})).then(function (channelsResult) {
var shareExcludes = $(".chkShareFolder:checked", page).get().map(function (i) {
@ -384,7 +384,7 @@
EnableLiveTv: false
}
}).done(function (result) {
}).then(function (result) {
$('#popupInvite').popup('close');
@ -425,7 +425,7 @@
function showInvitePopup(page) {
Dashboard.getCurrentUser().done(function (user) {
Dashboard.getCurrentUser().then(function (user) {
if (user.ConnectUserId) {