Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 23:52:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2383

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-03-09 15:30:52 -04:00
parent 33723f8b1b
commit 4d45a81fdb
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/ajaxify.js
View File

@@ -89,11 +89,9 @@ $(document).ready(function() {
app.previousUrl = url;
return ajaxify.go('login');
} else if (status === 302) {
if (data.responseJSON.path) {
if (!ajaxify.go(data.responseJSON.path, callback, quiet)) {
window.location.href = data.responseJSON.path;
}
} else if (data.responseJSON) {
if (data.responseJSON.external && data.responseJSON.path) {
window.location.href = data.responseJSON.path;
} else if (typeof data.responseJSON === 'string') {
ajaxify.go(data.responseJSON.slice(1), callback, quiet);
}
}
@@ -184,6 +182,9 @@ $(document).ready(function() {
}
},
error: function(data, textStatus) {
if (data.status === 0 && textStatus === 'error') {
data.status = 500;
}
callback({
data: data,
textStatus: textStatus
@@ -264,5 +265,6 @@ $(document).ready(function() {
ajaxifyAnchors();
app.load();
templates.cache['500'] = $('.tpl-500').html();
});

4
src/views/500.tpl
View File

@@ -1,7 +1,7 @@
<div class="alert alert-danger">
<strong>[[global:500.title]]</strong>
<p>[[global:500.message]]</p>
<p>{path}<p>
<p>{path}</p>
<!-- IF error --><p>{error}</p><!-- ENDIF error -->
</div>
</div>