Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 10:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-02 22:15:26 -07:00
parent f4147f7922 1012368acd
commit 360a35d0a6
295 changed files with 3018 additions and 2755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/src/ajaxify.js
View File

@@ -67,9 +67,7 @@ $(document).ready(function () {
apiXHR.abort();
}
if (!window.location.pathname.match(/\/(403|404)$/g)) {
app.previousUrl = window.location.href;
}
app.previousUrl = window.location.href;
url = ajaxify.start(url);
@@ -95,10 +93,7 @@ $(document).ready(function () {
retry = true;
app.template = data.template.name;
require(['translator'], function (translator) {
translator.load(translator.getLanguage(), data.template.name);
renderTemplate(url, data.template.name, data, callback);
});
renderTemplate(url, data.template.name, data, callback);
});
return true;