From 4798647b8a3c18eeef44d63ed5b550f972954434 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 29 Oct 2015 23:58:48 -0400 Subject: [PATCH] moved infinitescroll.parseAndTranslate to app.parseAndTranslate --- public/src/admin/manage/flags.js | 2 +- public/src/admin/manage/tags.js | 2 +- public/src/app.js | 17 ++++++++++++++++- public/src/client/account/followers.js | 2 +- public/src/client/account/posts.js | 2 +- public/src/client/account/profile.js | 2 +- public/src/client/account/topics.js | 2 +- public/src/client/category.js | 2 +- public/src/client/chats.js | 2 +- public/src/client/groups/memberlist.js | 2 +- public/src/client/infinitescroll.js | 8 -------- public/src/client/notifications.js | 2 +- public/src/client/recent.js | 2 +- public/src/client/tags.js | 2 +- public/src/client/topic/posts.js | 2 +- 15 files changed, 29 insertions(+), 22 deletions(-) diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js index 5cbf55f7f1..a7943784af 100644 --- a/public/src/admin/manage/flags.js +++ b/public/src/admin/manage/flags.js @@ -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'); diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js index 27c5b2459b..01f755612b 100644 --- a/public/src/admin/manage/tags.js +++ b/public/src/admin/manage/tags.js @@ -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; diff --git a/public/src/app.js b/public/src/app.js index 9638357f73..68a3a459bf 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -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)); + }); + }); + } + }; }()); diff --git a/public/src/client/account/followers.js b/public/src/client/account/followers.js index 8c98a6bacd..30976eaef5 100644 --- a/public/src/client/account/followers.js +++ b/public/src/client/account/followers.js @@ -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(); diff --git a/public/src/client/account/posts.js b/public/src/client/account/posts.js index b5b04056e8..35e60e890b 100644 --- a/public/src/client/account/posts.js +++ b/public/src/client/account/posts.js @@ -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(); diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index f0707cedb3..8301cff314 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -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(); diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index 33bf212633..d917be4ac4 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -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(); diff --git a/public/src/client/category.js b/public/src/client/category.js index 634317a21c..d213663aa8 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -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'); diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 3d7bd7bda0..f32ec38378 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -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(); }); diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.js index 0cbc0e9116..7fc3bb6781 100644 --- a/public/src/client/groups/memberlist.js +++ b/public/src/client/groups/memberlist.js @@ -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 diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index 39ede31eb6..b05c3a5a10 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -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; diff --git a/public/src/client/notifications.js b/public/src/client/notifications.js index 7c0dcd48c3..6d353ddc21 100644 --- a/public/src/client/notifications.js +++ b/public/src/client/notifications.js @@ -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(); diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 3468fba152..6d64034c04 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -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); diff --git a/public/src/client/tags.js b/public/src/client/tags.js index dedeb4a746..5ea916257e 100644 --- a/public/src/client/tags.js +++ b/public/src/client/tags.js @@ -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(); diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 89c9e70e1d..e83d30b36d 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -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) {