From 76d8d09f9b1ebe00d1c3220ed1e1ca813492ea95 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 4 Mar 2014 16:48:07 -0500 Subject: [PATCH] closes #1141 --- public/src/forum/topic.js | 12 ++++++------ public/templates/header.tpl | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index a5bdc4f6c1..6383cac823 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -12,8 +12,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { $(window).on('action:ajaxify.start', function(ev, data) { if(data.url.indexOf('topic') !== 0) { - $('.pagination-block').addClass('hide'); - $('#header-topic-title').html('').hide(); + $('.pagination-block').addClass('hidden'); + $('.header-topic-title').find('span').text('').hide(); app.removeAlert('bookmark'); } }); @@ -342,7 +342,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function enableInfiniteLoading() { if(!config.usePagination) { - $('.pagination-block').removeClass('hide'); + $('.pagination-block').removeClass('hidden'); app.enableInfiniteLoading(function(direction) { @@ -372,7 +372,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { } }); } else { - $('.pagination-block').addClass('hide'); + $('.pagination-block').addClass('hidden'); pagination.init(currentPage, pageCount); } @@ -1026,9 +1026,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { }); if($(window).scrollTop() > 50) { - $('#header-topic-title').text(templates.get('topic_name')).show(); + $('.header-topic-title').find('span').text(templates.get('topic_name')).show(); } else { - $('#header-topic-title').text('').hide(); + $('.header-topic-title').find('span').text('').hide(); } $($('.posts > .post-row').get().reverse()).each(function() { diff --git a/public/templates/header.tpl b/public/templates/header.tpl index decbae43da..9682271b8a 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -60,11 +60,16 @@

{title}

 + +
+ +
+
-