From 45ead9803f01c2cb84b11b3747e432737af27595 Mon Sep 17 00:00:00 2001 From: czaks Date: Sat, 27 Jul 2013 00:57:12 -0400 Subject: [PATCH] ukko: fix javascript interoperation Conflicts: js/expand.js js/hide-threads.js templates/themes/ukko/ukko.js --- js/expand.js | 13 +++++++++++-- js/hide-threads.js | 12 +++++++++--- js/show-backlinks.js | 7 ++++++- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/js/expand.js b/js/expand.js index f2cfdc5e..07ce9e43 100644 --- a/js/expand.js +++ b/js/expand.js @@ -14,8 +14,9 @@ $(document).ready(function(){ if($('div.banner').length != 0) return; // not index - $('div.post.op span.omitted').each(function() { + + var do_expand = function() { $(this) .html($(this).text().replace(_("Click reply to view."), ''+_("Click to expand")+'.')) .find('a').click(function() { @@ -50,5 +51,13 @@ $(document).ready(function(){ } }); }); + } + + $('div.post.op span.omitted').each(do_expand); + + $(document).bind("new_post", function(e, post) { + if (!$(post).hasClass("reply")) { + $(post).find('div.post.op span.omitted').each(do_expand); + } }); -}); \ No newline at end of file +}); diff --git a/js/hide-threads.js b/js/hide-threads.js index faa1289c..575804b6 100644 --- a/js/hide-threads.js +++ b/js/hide-threads.js @@ -41,11 +41,11 @@ $(document).ready(function(){ hidden_data[board] = {}; // id : timestamp } - $('div.post.op').each(function() { + var do_hide_threads = function() { var id = $(this).children('p.intro').children('a.post_no:eq(1)').text(); var thread_container = $(this).parent(); $('[–] ') - .insertBefore(thread_container.find(':first')) + .insertBefore(thread_container.find(':not(h2,h2 *):first')) .click(function() { hidden_data[board][id] = Math.round(Date.now() / 1000); store_data(); @@ -68,9 +68,15 @@ $(document).ready(function(){ hidden_div.remove(); }); - hidden_div.insertAfter(thread_container.find(':first')); + hidden_div.insertAfter(thread_container.find(':not(h2,h2 *):first')); }); if (hidden_data[board][id]) thread_container.find('.hide-thread-link').click(); + } + + $('div.post.op').each(do_hide_threads); + + $(document).bind('new_post', function(e, post) { + do_hide_threads.call($(post).find('div.post.op')[0]); }); }); diff --git a/js/show-backlinks.js b/js/show-backlinks.js index 4ead494b..f23cfc38 100644 --- a/js/show-backlinks.js +++ b/js/show-backlinks.js @@ -48,7 +48,12 @@ onready(function(){ $('div.post.reply').each(showBackLinks); $(document).bind('new_post', function(e, post) { - showBackLinks.call(post); + if ($(post).hasClass("reply")) { + showBackLinks.call(post); + } + else { + $(post).find('div.post.reply').each(showBackLinks); + } }); });