From b6f6867b50d31ad2ec5588c041fc01ced655304a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 24 Oct 2015 22:29:22 -0400 Subject: [PATCH] bottom bar change --- public/src/client/topic/posts.js | 7 +++++-- public/src/client/topic/threadTools.js | 7 ++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 784a11c4a4..f77af4189d 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -211,6 +211,7 @@ define('forum/topic/posts', [ }; Posts.processPage = function(posts) { + Posts.showBottomPostBar(); app.createUserTooltips(posts); app.replaceSelfLinks(posts.find('a')); utils.addCommasToNumbers(posts.find('.formatted-number')); @@ -225,11 +226,13 @@ define('forum/topic/posts', [ addBlockquoteEllipses(posts.find('[component="post/content"] > blockquote > blockquote')); hidePostToolsForDeletedPosts(posts); - Posts.showBottomPostBar(); }; Posts.showBottomPostBar = function() { - $('.bottom-post-bar').toggleClass('hidden', components.get('post').length <= 1 && !!components.get('post', 'index', 0).length); + var mainPost = components.get('post', 'index', 0); + if (!!mainPost.length && $('[component="post"]').length > 1) { + $('.post-bar').clone().appendTo(mainPost); + } }; function hidePostToolsForDeletedPosts(posts) { diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 9f9e7ce0a3..69c8fad673 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -97,7 +97,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move', 'comp }; function renderMenu() { - function render() { + $('.topic').on('show.bs.dropdown', '.thread-tools', function () { var $this = $(this); var dropdownMenu = $this.find('.dropdown-menu'); if (dropdownMenu.html()) { @@ -115,10 +115,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move', 'comp }); }); }); - } - - $('[component="topic"]').on('show.bs.dropdown', '.thread-tools', render); - $('.bottom-post-bar').on('show.bs.dropdown', '.thread-tools', render); + }); } function topicCommand(command, tid) {