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 on Internet Explorer

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-09-04 18:06:25 +02:00
parent ee9fde5402
commit 840039958a
12 changed files with 112 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
public_html/js/Auth.js
View File

@ -1,10 +1,10 @@
var App = App || {};
App.Auth = function(jQuery, api, appState) {
App.Auth = function(jQuery, util, api, appState, promise) {
function loginFromCredentials(userName, password, remember) {
return new Promise(function(resolve, reject) {
api.post('/login', {userName: userName, password: password})
return promise.make(function(resolve, reject) {
promise.wait(api.post('/login', {userName: userName, password: password}))
.then(function(response) {
updateAppState(response);
jQuery.cookie(
@ -12,38 +12,38 @@ App.Auth = function(jQuery, api, appState) {
response.json.token.name,
remember ? { expires: 365 } : {});
resolve(response);
}).catch(function(response) {
}).fail(function(response) {
reject(response);
});
});
};
function loginFromToken(token) {
return new Promise(function(resolve, reject) {
api.post('/login', {token: token})
return promise.make(function(resolve, reject) {
promise.wait(api.post('/login', {token: token}))
.then(function(response) {
updateAppState(response);
resolve(response);
}).catch(function(response) {
}).fail(function(response) {
reject(response);
});
});
};
function loginAnonymous() {
return new Promise(function(resolve, reject) {
api.post('/login')
return promise.make(function(resolve, reject) {
promise.wait(api.post('/login'))
.then(function(response) {
updateAppState(response);
resolve(response);
}).catch(function(response) {
}).fail(function(response) {
reject(response);
});
});
};
function logout() {
return new Promise(function(resolve, reject) {
return promise.make(function(resolve, reject) {
appState.set('loggedIn', false);
appState.set('loginToken', null);
jQuery.removeCookie('auth');
@ -52,7 +52,7 @@ App.Auth = function(jQuery, api, appState) {
};
function tryLoginFromCookie() {
return new Promise(function(resolve, reject) {
return promise.make(function(resolve, reject) {
if (appState.get('loggedIn')) {
resolve();
return;
@ -64,12 +64,13 @@ App.Auth = function(jQuery, api, appState) {
return;
}
loginFromToken(authCookie).then(function(response) {
resolve();
}).catch(function(response) {
jQuery.removeCookie('auth');
reject();
});
promise.wait(loginFromToken(authCookie))
.then(function(response) {
resolve();
}).fail(function(response) {
jQuery.removeCookie('auth');
reject();
});
});
};