Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-08 16:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from adarqui/issue-login-redirect-40x

Browse Source 
Issue login redirect 40x
This commit is contained in:
Julian Lam
2013-10-06 11:12:19 -07:00
parent 8e4b51fba4 4b0e915698
commit f95913e623
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/ajaxify.js
View File

@@ -117,7 +117,8 @@ var ajaxify = {};
if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:')
return;
app.previousUrl = window.location.href;
if(!window.location.pathname.match(/\/(403|404)$/g))
app.previousUrl = window.location.href;
if (!e.ctrlKey && e.which === 1) {
if (this.host === window.location.host) {
@@ -192,4 +193,4 @@ var ajaxify = {};
}
}
}(jQuery));
}(jQuery));

5
public/src/forum/login.js
View File

@@ -35,6 +35,9 @@ define(function() {
$('#login-error-notify').show();
} else {
$('#login-error-notify').hide();
if(!app.previousUrl) { app.previousUrl = '/'; }
if(app.previousUrl.indexOf('/reset/') != -1)
window.location.replace(RELATIVE_PATH + "/?loggedin");
else
@@ -63,4 +66,4 @@ define(function() {
};
return Login;
});
});