diff --git a/4chan_x.user.js b/4chan_x.user.js index b89149c40..e7a877ccc 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -582,9 +582,8 @@ }, name: function(root) { var name; - if ((name = root.className === 'op' ? $('.postername', root).textContent : $('.commentpostername', root).textContent)) { - return filter.test('name', name); - } + name = root.className === 'op' ? $('.postername', root) : $('.commentpostername', root); + return filter.test('name', name.textContent); }, trip: function(root) { var trip; @@ -600,17 +599,13 @@ }, sub: function(root) { var sub; - if ((sub = root.className === 'op' ? $('.filetitle', root).textContent : $('.replytitle', root).textContent)) { - return filter.test('sub', sub); - } + sub = root.className === 'op' ? $('.filetitle', root) : $('.replytitle', root); + return filter.test('sub', sub.textContent); }, com: function(root) { - var com; - if (com = ($.el('a', { + return filter.test('com', ($.el('a', { innerHTML: $('blockquote', root).innerHTML.replace(/
/g, '\n') - })).textContent) { - return filter.test('com', com); - } + })).textContent); }, file: function(root) { var file; diff --git a/script.coffee b/script.coffee index 250714aa0..4fad8d414 100644 --- a/script.coffee +++ b/script.coffee @@ -415,8 +415,8 @@ filter = return true if regexp.test value name: (root) -> - if (name = if root.className is 'op' then $('.postername', root).textContent else $('.commentpostername', root).textContent) - filter.test 'name', name + name = if root.className is 'op' then $ '.postername', root else $ '.commentpostername', root + filter.test 'name', name.textContent trip: (root) -> if trip = $ '.postertrip', root filter.test 'trip', trip.textContent @@ -424,11 +424,10 @@ filter = if mail = $ '.linkmail', root filter.test 'mail', mail.href sub: (root) -> - if (sub = if root.className is 'op' then $('.filetitle', root).textContent else $('.replytitle', root).textContent) - filter.test 'sub', sub + sub = if root.className is 'op' then $ '.filetitle', root else $ '.replytitle', root + filter.test 'sub', sub.textContent com: (root) -> - if com = ($.el 'a', innerHTML: $('blockquote', root).innerHTML.replace /
/g, '\n').textContent - filter.test 'com', com + filter.test 'com', ($.el 'a', innerHTML: $('blockquote', root).innerHTML.replace /
/g, '\n').textContent file: (root) -> if file = $ '.filesize span', root filter.test 'file', file.title