Merge (partially) branch 'master' of https://github.com/savetheinternet/Tinyboard

Let's not merge part of it for now; it break things here

Conflicts:
	js/post-hover.js

2 files changed, 10 insertions, 4 deletions

diff --git a/js/post-hover.js b/js/post-hover.js
index 040b6a73..783740df 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -108,7 +108,7 @@ onready(function(){
 						else {
 							$(data).find('div[id^="thread_"]').hide().attr('data-cached', 'yes').prependTo('form[name="postcontrols"]');
 						}
-						
+
 						$post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id);
 						if(hovering && $post.length > 0) {
 							start_hover($link);
diff --git a/js/toggle-images.js b/js/toggle-images.js
index de1d47b3..9927031a 100644
--- a/js/toggle-images.js
+++ b/js/toggle-images.js
@@ -58,10 +58,10 @@ $(document).ready(function(){
 		.click(function() {
 			hide_images = !hide_images;
 			if (hide_images) {
-				$('div > a > img').each(hideImage);
+				$('img.post-image').each(hideImage);
 				localStorage.hideimages = true;
 			} else {
-				$('div > a > img').each(restoreImage);
+				$('img.post-image').each(restoreImage);
 				delete localStorage.hideimages;
 			}
 			
@@ -71,7 +71,13 @@ $(document).ready(function(){
 		});
 
 	if (hide_images) {
-		$('div > a > img').each(hideImage);
+		$('img.post-image').each(hideImage);
 		show_hide_hide_images_buttons();
 	}
+	
+	$(document).bind('new_post', function(e, post) {
+		if (hide_images) {
+			$(post).find('img.post-image').each(hideImage);
+		}
+	});
 });