Skip to content

brainfood / frontend-auth

Go to a project
Toggle navigation
Toggle navigation pinning
26baf78d by Ean Schuessler
Options

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

2 parents 8b4d562b f8f26f60
Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
1 { 1 {
2 "name": "frontend-auth", 2 "name": "frontend-auth",
3 "version": "2016.08.05-5", 3 "version": "2016.08.10-1",
4 "authors": [ 4 "authors": [
5 "Adam Heath <doogie@brainfood.com>" 5 "Adam Heath <doogie@brainfood.com>"
6 ], 6 ],
......
1 { 1 {
2 "name": "backbone-model-overlay", 2 "name": "backbone-model-overlay",
3 "version": "2016.08.05-5", 3 "version": "2016.08.10-1",
4 "main": [ 4 "main": [
5 "src/scripts/Auth.js" 5 "src/scripts/Auth.js"
6 ], 6 ],
......
...@@ -203,7 +203,7 @@ define(function(require) { ...@@ -203,7 +203,7 @@ define(function(require) {
203 var apiHandler = globalOptions.api || function(apiName, data) {}; 203 var apiHandler = globalOptions.api || function(apiName, data) {};
204 return apiHandler(apiName, data, {sessionId: self.get('sessionId')}).always(function() { 204 return apiHandler(apiName, data, {sessionId: self.get('sessionId')}).always(function() {
205 self.unset('errorMessage'); 205 self.unset('errorMessage');
206 }).done(applyLoginResults).error(function(xhr) { 206 }).done(applyLoginResults).fail(function(xhr) {
207 if (xhr.responseJSON && xhr.responseJSON.errorMessage) { 207 if (xhr.responseJSON && xhr.responseJSON.errorMessage) {
208 self.set('errorMessage', xhr.responseJSON.errorMessage); 208 self.set('errorMessage', xhr.responseJSON.errorMessage);
209 } 209 }
......