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

moved infinitescroll.parseAndTranslate to app.parseAndTranslate

Browse Source
This commit is contained in:
psychobunny
2015-10-29 23:58:48 -04:00
parent 49aa620ce3
commit 4798647b8a
15 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/admin/manage/flags.js
View File

@@ -88,7 +88,7 @@ define('admin/manage/flags', [
after: $('[data-next]').attr('data-next')
}, function(data, done) {
if (data.posts && data.posts.length) {
infinitescroll.parseAndTranslate('admin/manage/flags', 'posts', {posts: data.posts}, function(html) {
app.parseAndTranslate('admin/manage/flags', 'posts', {posts: data.posts}, function(html) {
$('[data-next]').attr('data-next', data.next);
$('.post-container').append(html);
html.find('img:not(.not-responsive)').addClass('img-responsive');

2
public/src/admin/manage/tags.js
View File

@@ -30,7 +30,7 @@ define('admin/manage/tags', [
return app.alertError(err.message);
}
infinitescroll.parseAndTranslate('admin/manage/tags', 'tags', {tags: result.tags}, function(html) {
app.parseAndTranslate('admin/manage/tags', 'tags', {tags: result.tags}, function(html) {
$('.tag-list').html(html);
utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
timeoutId = 0;

17
public/src/app.js
View File

@@ -497,5 +497,20 @@ app.cacheBuster = null;
}
};
app.parseAndTranslate = function(template, blockName, data, callback) {
if (typeof blockName === 'string') {
templates.parse(template, blockName, data, function(html) {
translator.translate(html, function(translatedHTML) {
callback($(translatedHTML));
});
});
} else {
callback = data, data = blockName;
templates.parse(template, data, function(html) {
translator.translate(html, function(translatedHTML) {
callback($(translatedHTML));
});
});
}
};
}());

2
public/src/client/account/followers.js
View File

@@ -32,7 +32,7 @@ define('forum/account/followers', ['forum/account/header', 'forum/infinitescroll
};
function onUsersLoaded(tpl, users, callback) {
infinitescroll.parseAndTranslate(tpl, 'users', {users: users}, function(html) {
app.parseAndTranslate(tpl, 'users', {users: users}, function(html) {
$('#users-container').append(html);
utils.addCommasToNumbers(html.find('.formatted-number'));
callback();

2
public/src/client/account/posts.js
View File

@@ -41,7 +41,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'],
}
function onPostsLoaded(posts, callback) {
infinitescroll.parseAndTranslate(template, 'posts', {posts: posts}, function(html) {
app.parseAndTranslate(template, 'posts', {posts: posts}, function(html) {
$('[component="posts"]').append(html);
html.find('img:not(.not-responsive)').addClass('img-responsive');
html.find('.timeago').timeago();

2
public/src/client/account/profile.js
View File

@@ -112,7 +112,7 @@ define('forum/account/profile', [
return callback();
}
infinitescroll.parseAndTranslate('account/profile', 'posts', {posts: posts}, function(html) {
app.parseAndTranslate('account/profile', 'posts', {posts: posts}, function(html) {
$('[component="posts"]').append(html);
html.find('.timeago').timeago();

2
public/src/client/account/topics.js
View File

@@ -41,7 +41,7 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'],
}
function onTopicsLoaded(topics, callback) {
infinitescroll.parseAndTranslate('account/topics', 'topics', {topics: topics}, function(html) {
app.parseAndTranslate('account/topics', 'topics', {topics: topics}, function(html) {
$('[component="category"]').append(html);
html.find('.timeago').timeago();
app.createUserTooltips();

2
public/src/client/category.js
View File

@@ -305,7 +305,7 @@ define('forum/category', [
before = topics.first();
}
infinitescroll.parseAndTranslate('category', 'topics', data, function(html) {
app.parseAndTranslate('category', 'topics', data, function(html) {
$('[component="category"]').removeClass('hidden');
$('.category-sidebar').removeClass('hidden');

2
public/src/client/chats.js
View File

@@ -366,7 +366,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
return callback();
}
infinitescroll.parseAndTranslate('chats', 'chats', {chats: users}, function(html) {
app.parseAndTranslate('chats', 'chats', {chats: users}, function(html) {
$('.recent-chats').append(html);
callback();
});

2
public/src/client/groups/memberlist.js
View File

@@ -85,7 +85,7 @@ define('forum/groups/memberlist', ['components', 'forum/infinitescroll'], functi
}
function parseAndTranslate(users, callback) {
infinitescroll.parseAndTranslate('groups/details', 'members', {
app.parseAndTranslate('groups/details', 'members', {
group: {
members: users,
isOwner: ajaxify.data.group.isOwner

8
public/src/client/infinitescroll.js
View File

@@ -60,14 +60,6 @@ define('forum/infinitescroll', ['translator'], function(translator) {
});
};
scroll.parseAndTranslate = function(template, blockName, data, callback) {
templates.parse(template, blockName, data, function(html) {
translator.translate(html, function(translatedHTML) {
callback($(translatedHTML));
});
});
};
scroll.removeExtra = function(els, direction, count) {
if (els.length <= count) {
return;

2
public/src/client/notifications.js
View File

@@ -47,7 +47,7 @@ define('forum/notifications', ['components', 'notifications', 'forum/infinitescr
if (!data.notifications || !data.notifications.length) {
return done();
}
infinitescroll.parseAndTranslate('notifications', 'notifications', {notifications: data.notifications}, function(html) {
app.parseAndTranslate('notifications', 'notifications', {notifications: data.notifications}, function(html) {
notifList.append(html);
html.find('.timeago').timeago();
done();

2
public/src/client/recent.js
View File

@@ -110,7 +110,7 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
return callback();
}
infinitescroll.parseAndTranslate(templateName, 'topics', {topics: topics, showSelect: showSelect}, function(html) {
app.parseAndTranslate(templateName, 'topics', {topics: topics, showSelect: showSelect}, function(html) {
$('#category-no-topics').remove();
$('[component="category"]').append(html);

2
public/src/client/tags.js
View File

@@ -64,7 +64,7 @@ define('forum/tags', ['forum/infinitescroll'], function(infinitescroll) {
function onTagsLoaded(tags, replace, callback) {
callback = callback || function() {};
infinitescroll.parseAndTranslate('tags', 'tags', {tags: tags}, function(html) {
app.parseAndTranslate('tags', 'tags', {tags: tags}, function(html) {
$('.tag-list')[replace ? 'html' : 'append'](html);
utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
callback();

2
public/src/client/topic/posts.js
View File

@@ -145,7 +145,7 @@ define('forum/topic/posts', [
$(window).trigger('action:posts.loading', {posts: data.posts, after: after, before: before});
infinitescroll.parseAndTranslate('topic', 'posts', data, function(html) {
app.parseAndTranslate('topic', 'posts', data, function(html) {
if (after) {
html.insertAfter(after);
} else if (before) {