26baf78d by Ean Schuessler

Merge branch 'BF-7564' of /home/git/repositories/brainfood/frontend-auth

2 parents 8b4d562b f8f26f60
{
"name": "frontend-auth",
"version": "2016.08.05-5",
"version": "2016.08.10-1",
"authors": [
"Adam Heath <doogie@brainfood.com>"
],
......
{
"name": "backbone-model-overlay",
"version": "2016.08.05-5",
"version": "2016.08.10-1",
"main": [
"src/scripts/Auth.js"
],
......
......@@ -203,7 +203,7 @@ define(function(require) {
var apiHandler = globalOptions.api || function(apiName, data) {};
return apiHandler(apiName, data, {sessionId: self.get('sessionId')}).always(function() {
self.unset('errorMessage');
}).done(applyLoginResults).error(function(xhr) {
}).done(applyLoginResults).fail(function(xhr) {
if (xhr.responseJSON && xhr.responseJSON.errorMessage) {
self.set('errorMessage', xhr.responseJSON.errorMessage);
}
......