Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
brainfood
/
frontend-auth
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
26baf78d
authored
2016-08-10 11:51:08 -0500
by
Ean Schuessler
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'BF-7564' of /home/git/repositories/brainfood/frontend-auth
2 parents
8b4d562b
f8f26f60
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
bower.json
package.json
src/scripts/Auth.js
bower.json
View file @
26baf78
{
"name"
:
"frontend-auth"
,
"version"
:
"2016.08.
05-5
"
,
"version"
:
"2016.08.
10-1
"
,
"authors"
:
[
"Adam Heath <doogie@brainfood.com>"
],
...
...
package.json
View file @
26baf78
{
"name"
:
"backbone-model-overlay"
,
"version"
:
"2016.08.
05-5
"
,
"version"
:
"2016.08.
10-1
"
,
"main"
:
[
"src/scripts/Auth.js"
],
...
...
src/scripts/Auth.js
View file @
26baf78
...
...
@@ -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
);
}
...
...
Please
register
or
sign in
to post a comment