Filtered posts are now added to the PostHiding DataBoard

Fixes #632
This commit is contained in:
Zixaphir 2014-03-11 15:59:02 -07:00
parent 0dd77eb92c
commit 6bb31cc845
4 changed files with 56 additions and 30 deletions

View File

@ -1259,6 +1259,11 @@
Recursive.apply('hide', this, label, makeStub, true); Recursive.apply('hide', this, label, makeStub, true);
Recursive.add('hide', this, label, makeStub, true); Recursive.add('hide', this, label, makeStub, true);
} }
PostHiding.saveHiddenState(this, {
thisPost: true,
hideRecursively: hideRecursively,
makeStub: makeStub
});
if (!this.isReply) { if (!this.isReply) {
this.thread.hide(); this.thread.hide();
return; return;
@ -1300,6 +1305,11 @@
Recursive.apply('show', this, true); Recursive.apply('show', this, true);
Recursive.rm('hide', this); Recursive.rm('hide', this);
} }
PostHiding.saveHiddenState(this, {
thisPost: true,
hideRecursively: showRecursively,
makeStub: !!this.nodes.stub
});
if (!this.isReply) { if (!this.isReply) {
this.thread.show(); this.thread.show();
return; return;
@ -4942,7 +4952,6 @@
} else { } else {
post.hide('Manually hidden'); post.hide('Manually hidden');
} }
PostHiding.saveHiddenState(post);
if (post.isReply) { if (post.isReply) {
return; return;
} }
@ -5119,15 +5128,17 @@
} else { } else {
return; return;
} }
PostHiding.saveHiddenState(post, { if (!thisPost) {
thisPost: thisPost, PostHiding.saveHiddenState(post, {
hideRecursively: replies, thisPost: false,
makeStub: makeStub hideRecursively: replies,
}); makeStub: makeStub
});
}
return $.event('CloseMenu'); return $.event('CloseMenu');
}, },
show: function(post) { show: function(post) {
var parent, replies, thisPost, val; var parent, replies, thisPost;
parent = this.parentNode; parent = this.parentNode;
thisPost = $('input[name=thisPost]', parent).checked; thisPost = $('input[name=thisPost]', parent).checked;
replies = $('input[name=replies]', parent).checked; replies = $('input[name=replies]', parent).checked;
@ -5139,12 +5150,13 @@
} else { } else {
return; return;
} }
val = { if (!thisPost) {
thisPost: !thisPost, PostHiding.saveHiddenState(post, {
hideRecursively: !replies, thisPost: false,
makeStub: !!post.nodes.stub hideRecursively: !replies,
}; makeStub: !!post.nodes.stub
PostHiding.saveHiddenState(post, val); });
}
return $.event('CloseMenu'); return $.event('CloseMenu');
} }
} }

View File

@ -1314,6 +1314,11 @@
Recursive.apply('hide', this, label, makeStub, true); Recursive.apply('hide', this, label, makeStub, true);
Recursive.add('hide', this, label, makeStub, true); Recursive.add('hide', this, label, makeStub, true);
} }
PostHiding.saveHiddenState(this, {
thisPost: true,
hideRecursively: hideRecursively,
makeStub: makeStub
});
if (!this.isReply) { if (!this.isReply) {
this.thread.hide(); this.thread.hide();
return; return;
@ -1355,6 +1360,11 @@
Recursive.apply('show', this, true); Recursive.apply('show', this, true);
Recursive.rm('hide', this); Recursive.rm('hide', this);
} }
PostHiding.saveHiddenState(this, {
thisPost: true,
hideRecursively: showRecursively,
makeStub: !!this.nodes.stub
});
if (!this.isReply) { if (!this.isReply) {
this.thread.show(); this.thread.show();
return; return;
@ -4994,7 +5004,6 @@
} else { } else {
post.hide('Manually hidden'); post.hide('Manually hidden');
} }
PostHiding.saveHiddenState(post);
if (post.isReply) { if (post.isReply) {
return; return;
} }
@ -5171,15 +5180,17 @@
} else { } else {
return; return;
} }
PostHiding.saveHiddenState(post, { if (!thisPost) {
thisPost: thisPost, PostHiding.saveHiddenState(post, {
hideRecursively: replies, thisPost: false,
makeStub: makeStub hideRecursively: replies,
}); makeStub: makeStub
});
}
return $.event('CloseMenu'); return $.event('CloseMenu');
}, },
show: function(post) { show: function(post) {
var parent, replies, thisPost, val; var parent, replies, thisPost;
parent = this.parentNode; parent = this.parentNode;
thisPost = $('input[name=thisPost]', parent).checked; thisPost = $('input[name=thisPost]', parent).checked;
replies = $('input[name=replies]', parent).checked; replies = $('input[name=replies]', parent).checked;
@ -5191,12 +5202,13 @@
} else { } else {
return; return;
} }
val = { if (!thisPost) {
thisPost: !thisPost, PostHiding.saveHiddenState(post, {
hideRecursively: !replies, thisPost: false,
makeStub: !!post.nodes.stub hideRecursively: !replies,
}; makeStub: !!post.nodes.stub
PostHiding.saveHiddenState(post, val); });
}
return $.event('CloseMenu'); return $.event('CloseMenu');
} }
} }

View File

@ -56,7 +56,6 @@ PostHiding =
post.show() post.show()
else else
post.hide 'Manually hidden' post.hide 'Manually hidden'
PostHiding.saveHiddenState post
return if post.isReply return if post.isReply
Index.updateHideLabel() Index.updateHideLabel()
@ -171,7 +170,7 @@ PostHiding =
Recursive.add 'hide', post, label, makeStub, true Recursive.add 'hide', post, label, makeStub, true
else else
return return
PostHiding.saveHiddenState post, {thisPost, hideRecursively: replies, makeStub} PostHiding.saveHiddenState post, {thisPost: false, hideRecursively: replies, makeStub} unless thisPost
$.event 'CloseMenu' $.event 'CloseMenu'
show: (post) -> show: (post) ->
parent = @parentNode parent = @parentNode
@ -184,6 +183,5 @@ PostHiding =
Recursive.rm 'hide', post, true Recursive.rm 'hide', post, true
else else
return return
val = {thisPost: !thisPost, hideRecursively: !replies, makeStub: !!post.nodes.stub} PostHiding.saveHiddenState post, {thisPost: false, hideRecursively: !replies, makeStub: !!post.nodes.stub} unless thisPost
PostHiding.saveHiddenState post, val
$.event 'CloseMenu' $.event 'CloseMenu'

View File

@ -179,6 +179,8 @@ class Post
Recursive.apply 'hide', @, label, makeStub, true Recursive.apply 'hide', @, label, makeStub, true
Recursive.add 'hide', @, label, makeStub, true Recursive.add 'hide', @, label, makeStub, true
PostHiding.saveHiddenState @, {thisPost: true, hideRecursively: hideRecursively, makeStub: makeStub}
if !@isReply if !@isReply
@thread.hide() @thread.hide()
return return
@ -211,6 +213,8 @@ class Post
Recursive.apply 'show', @, true Recursive.apply 'show', @, true
Recursive.rm 'hide', @ Recursive.rm 'hide', @
PostHiding.saveHiddenState @, {thisPost: true, hideRecursively: showRecursively, makeStub: !!@nodes.stub}
if !@isReply if !@isReply
@thread.show() @thread.show()
return return