ukko: fix javascript interoperation

Conflicts:
	js/expand.js
	js/hide-threads.js
	templates/themes/ukko/ukko.js

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."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
 			.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();
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.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);
+		}
 	});
 });