Merge branch 'master' into production

This commit is contained in:
Matt Lott 2015-12-10 13:02:45 -08:00
commit 3f9870b96e

View file

@ -51,10 +51,7 @@ module.exports.loginUser = (userObject, failure=genericFailure, nextURL=null) ->
module.exports.logoutUser = ->
FB?.logout?()
callback = ->
if (window.location.href.indexOf("/account/settings") > -1)
window.location = '/'
else
window.location.reload()
window.location = '/hoc'
res = $.post('/auth/logout', {}, callback)
res.fail(genericFailure)