scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed promises and its race conditions

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-02 00:30:25 +02:00
parent e1ae4eaa0d
commit 455ae2b881
18 changed files with 113 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public_html/js/Presenters/UserActivationPresenter.js
View File

@ -70,7 +70,7 @@ App.Presenters.UserActivationPresenter = function(
'/password-reset/' + userNameOrEmail :
'/activation/' + userNameOrEmail;
api.post(url)
promise.wait(api.post(url))
.then(function(response) {
var message = operation === 'passwordReset' ?
'Password reset request sent.' :
@ -92,7 +92,7 @@ App.Presenters.UserActivationPresenter = function(
'/finish-password-reset/' + token :
'/finish-activation/' + token;
api.post(url)
promise.wait(api.post(url))
.then(function(response) {
var message = operation === 'passwordReset' ?
'Your new password is <strong>' + response.json.newPassword + '</strong>.' :