mirror of
https://github.com/vichan-devel/vichan.git
synced 2025-01-30 20:03:45 +01:00
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
This commit is contained in:
commit
d0c72927a6
@ -108,7 +108,7 @@ onready(function(){
|
|||||||
else {
|
else {
|
||||||
$(data).find('div[id^="thread_"]').hide().attr('data-cached', 'yes').prependTo('form[name="postcontrols"]');
|
$(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);
|
$post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id);
|
||||||
if(hovering && $post.length > 0) {
|
if(hovering && $post.length > 0) {
|
||||||
start_hover($link);
|
start_hover($link);
|
||||||
|
@ -58,10 +58,10 @@ $(document).ready(function(){
|
|||||||
.click(function() {
|
.click(function() {
|
||||||
hide_images = !hide_images;
|
hide_images = !hide_images;
|
||||||
if (hide_images) {
|
if (hide_images) {
|
||||||
$('div > a > img').each(hideImage);
|
$('img.post-image').each(hideImage);
|
||||||
localStorage.hideimages = true;
|
localStorage.hideimages = true;
|
||||||
} else {
|
} else {
|
||||||
$('div > a > img').each(restoreImage);
|
$('img.post-image').each(restoreImage);
|
||||||
delete localStorage.hideimages;
|
delete localStorage.hideimages;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,7 +71,13 @@ $(document).ready(function(){
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (hide_images) {
|
if (hide_images) {
|
||||||
$('div > a > img').each(hideImage);
|
$('img.post-image').each(hideImage);
|
||||||
show_hide_hide_images_buttons();
|
show_hide_hide_images_buttons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(document).bind('new_post', function(e, post) {
|
||||||
|
if (hide_images) {
|
||||||
|
$(post).find('img.post-image').each(hideImage);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user