Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 19:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
This commit is contained in:
Julian Lam
2015-10-25 07:33:59 -04:00
parent 167ba64018 a739ad81ab
commit b52475c270
112 changed files with 1769 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/ajaxify.js
View File

@@ -46,7 +46,7 @@ $(document).ready(function() {
return true;
}
app.enterRoom('');
app.leaveCurrentRoom();
$(window).off('scroll');
@@ -56,6 +56,7 @@ $(document).ready(function() {
url = ajaxify.start(url, quiet);
$('body').removeClass(ajaxify.data.bodyClass);
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
ajaxify.loadData(url, function(err, data) {
@@ -141,6 +142,7 @@ $(document).ready(function() {
templates.parse(tpl_url, data, function(template) {
translator.translate(template, function(translatedTemplate) {
$('body').addClass(data.bodyClass);
$('#content').html(translatedTemplate);
ajaxify.end(url, tpl_url);
@@ -222,9 +224,7 @@ $(document).ready(function() {
$(window).trigger('action:ajaxify.dataLoaded', {url: url, data: data});
if (callback) {
callback(null, data);
}
callback(null, data);
},
error: function(data, textStatus) {
if (data.status === 0 && textStatus === 'error') {