kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

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

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

Conflicts:
	js/post-hover.js
This commit is contained in:
czaks 2013-08-16 11:29:13 -04:00
commit d0c72927a6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/post-hover.js
View File

@ -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);

12
js/toggle-images.js
View File

@ -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);
}
});
});