Skip to content

Commit

Permalink
fix: use promises in privilege save
Browse files Browse the repository at this point in the history
... instead of jQuery Deferreds
  • Loading branch information
julianlam committed Aug 21, 2020
1 parent 7a5daff commit 9cbe938
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions public/src/admin/manage/privileges.js
Expand Up @@ -115,7 +115,7 @@ define('admin/manage/privileges', [
return Privileges.setPrivilege(member, privilege, state);
});

$.when(requests).done(function () {
Promise.allSettled(requests).then(function () {
Privileges.refreshPrivilegeTable();
app.alertSuccess('[[admin/manage/privileges:alert.saved]]');
});
Expand Down Expand Up @@ -180,23 +180,21 @@ define('admin/manage/privileges', [
};

Privileges.setPrivilege = function (member, privilege, state) {
var deferred = $.Deferred();

socket.emit('admin.categories.setPrivilege', {
cid: isNaN(cid) ? 0 : cid,
privilege: privilege,
set: state,
member: member,
}, function (err) {
if (err) {
deferred.reject(err);
return app.alertError(err.message);
}
return new Promise(function (resolve, reject) {
socket.emit('admin.categories.setPrivilege', {
cid: isNaN(cid) ? 0 : cid,
privilege: privilege,
set: state,
member: member,
}, function (err) {
if (err) {
reject(err);
return app.alertError(err.message);
}

deferred.resolve();
resolve();
});
});

return deferred.promise();
};

Privileges.addUserToPrivilegeTable = function () {
Expand Down

0 comments on commit 9cbe938

Please sign in to comment.