summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-12-25 18:12:00 +0100
committerMichael Foster <savetheinterpod@gmail.com>2014-01-19 14:48:03 -0500
commit22869ce015e87ce216685f3d350c490fff6d7fbb (patch)
tree8cf4d4b4b74b4d53c82578b13a0052e584c21b88
parentbb3f3db0cd042c985795ba549c3d0f3080cb581b (diff)
fix hide-images.js interactions (should be STI-safe)
Conflicts: js/expand.js
-rw-r--r--js/expand.js1
-rw-r--r--js/hide-images.js23
2 files changed, 15 insertions, 9 deletions
diff --git a/js/expand.js b/js/expand.js
index 07ce9e43..1d1ac337 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -28,6 +28,7 @@ $(document).ready(function(){
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) {
diff --git a/js/hide-images.js b/js/hide-images.js
index 365ebac6..39cfe2f5 100644
--- a/js/hide-images.js
+++ b/js/hide-images.js
@@ -16,8 +16,6 @@
$(document).ready(function(){
$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
- var board = $('form input[name="board"]').val().toString();
-
if (!localStorage.hiddenimages)
localStorage.hiddenimages = '{}';
@@ -38,14 +36,16 @@ $(document).ready(function(){
}
}
- if (!hidden_data[board]) {
- hidden_data[board] = {}; // id : timestamp
- }
-
- $('div.post > a > img, div > a > img').each(function() {
+ var handle_images = function() {
var img = this;
var fileinfo = $(this).parent().prev();
var id = $(this).parent().parent().find('>p.intro>a.post_no:eq(1),>div.post.op>p.intro>a.post_no:eq(1)').text();
+
+ var board = $(this).parents('[id^="thread_"]').data("board");
+
+ if (!hidden_data[board]) {
+ hidden_data[board] = {}; // id : timestamp
+ }
var replacement = $('<span>'+_('File')+' <small>(<a class="hide-image-link" href="javascript:void(0)">'+_('hide')+'</a>)</small>: </span>');
@@ -79,6 +79,11 @@ $(document).ready(function(){
if (hidden_data[board][id])
$(this).parent().prev().find('.hide-image-link').click();
-
- });
+ };
+
+ $('div.post > a > img, div > a > img').each(handle_images);
+
+ $(document).bind('new_post', function(e, post) {
+ $(post).find('> a > img').each(handle_images);
+ });
});