From d2aaf9e63ae66665c4ea2eb9b4a5db2f9cb751c3 Mon Sep 17 00:00:00 2001 From: joosera Date: Fri, 4 Apr 2014 03:24:01 +0100 Subject: [PATCH] Fix js/expand.js Fixed missing end tags and changed .text to .html since .text strips HTML --- js/expand.js | 77 ++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/js/expand.js b/js/expand.js index 8fd3ba29..1c12a07b 100644 --- a/js/expand.js +++ b/js/expand.js @@ -18,49 +18,50 @@ $(document).ready(function(){ 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() { - var thread = $(this).parent().parent().parent(); - var id = thread.attr('id').replace(/^thread_/, ''); - $.ajax({ - url: thread.find('p.intro a.post_no:first').attr('href'), - context: document.body, - success: function(data) { - var last_expanded = false; - $(data).find('div.post.reply').each(function() { - thread.find('div.hidden').remove(); - var post_in_doc = thread.find('#' + $(this).attr('id')); - if(post_in_doc.length == 0) { - if(last_expanded) { - $(this).addClass('expanded').insertAfter(last_expanded).before('
'); + var do_expand = function() { + $(this) + .html($(this).html().replace(_("Click reply to view."), ''+_("Click to expand")+'.')) + .find('a').click(function() { + var thread = $(this).parent().parent().parent(); + var id = thread.attr('id').replace(/^thread_/, ''); + $.ajax({ + url: thread.find('p.intro a.post_no:first').attr('href'), + context: document.body, + success: function(data) { + var last_expanded = false; + $(data).find('div.post.reply').each(function() { + thread.find('div.hidden').remove(); + var post_in_doc = thread.find('#' + $(this).attr('id')); + if(post_in_doc.length == 0) { + if(last_expanded) { + $(this).addClass('expanded').insertAfter(last_expanded).before('
'); + } else { + $(this).addClass('expanded').insertAfter(thread.find('div.post:first')).after('
'); + } + last_expanded = $(this); + $(document).trigger('new_post', this); } else { - $(this).addClass('expanded').insertAfter(thread.find('div.post:first')).after('
'); + last_expanded = post_in_doc; } - last_expanded = $(this); - $(document).trigger('new_post', this); - } else { - last_expanded = post_in_doc; - } - }); - $('' + _('Hide expanded replies') + '.') - .insertAfter(thread.find('span.omitted').css('display', 'none')) - .click(function() { - thread.find('.expanded').remove(); - $(this).prev().css('display', ''); - $(this).remove(); }); - } + $('' + _('Hide expanded replies') + '.') + .insertAfter(thread.find('span.omitted').css('display', 'none')) + .click(function() { + thread.find('.expanded').remove(); + $(this).prev().css('display', ''); + $(this).remove(); + }); + } + }); }); - }); - } + } - $('div.post.op span.omitted').each(do_expand); + $('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); - } + $(document).bind("new_post", function(e, post) { + if (!$(post).hasClass("reply")) { + $(post).find('div.post.op span.omitted').each(do_expand); + } + }); }); });