Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore email after sage.

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-24 18:02:52 +01:00
parent c9b7c0f15c
commit de4c34746c
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
4chan_x.user.js
View File

@ -1346,10 +1346,15 @@
reply: (function() { reply: (function() {
function _Class(file) { function _Class(file) {
var persona, previous, _ref, var persona, previous,
_this = this; _this = this;
previous = qr.replies[qr.replies.length - 1];
persona = $.get('qr.persona', {});
this.name = previous ? previous.name : persona.name || null;
this.email = previous && !/^sage$/.test(previous.email) ? previous.email : persona.email || null;
this.sub = previous && conf['Remember Subject'] ? previous.sub : conf['Remember Subject'] ? persona.sub : null;
this.spoiler = previous && conf['Remember Spoiler'] ? previous.spoiler : false;
this.com = null; this.com = null;
_ref = (previous = qr.replies[qr.replies.length - 1]) ? [previous.name, /^sage$/.test(previous.email) ? null : previous.email, conf['Remember Subject'] ? previous.sub : null, conf['Remember Spoiler'] ? previous.spoiler : false] : (persona = $.get('qr.persona', {})) ? [persona.name || null, persona.email || null, conf['Remember Subject'] ? persona.sub || null : null, false] : void 0, this.name = _ref[0], this.email = _ref[1], this.sub = _ref[2], this.spoiler = _ref[3];
this.el = $.el('a', { this.el = $.el('a', {
className: 'preview', className: 'preview',
href: 'javascript:;', href: 'javascript:;',
@ -1632,9 +1637,10 @@
} }
reply = qr.replies[0]; reply = qr.replies[0];
sage = /sage/i.test(reply.email); sage = /sage/i.test(reply.email);
persona = $.get('qr.persona', {});
persona = { persona = {
name: reply.name, name: reply.name,
email: /^sage$/.test(reply.email) ? null : reply.email, email: /^sage$/.test(reply.email) ? persona.email : reply.email,
sub: conf['Remember Subject'] ? reply.sub : null sub: conf['Remember Subject'] ? reply.sub : null
}; };
$.set('qr.persona', persona); $.set('qr.persona', persona);

26
script.coffee
View File

@ -991,22 +991,13 @@ qr =
reply: class reply: class
constructor: (file) -> constructor: (file) ->
# set values, or null, to avoid 'undefined' values in inputs # set values, or null, to avoid 'undefined' values in inputs
previous = qr.replies[qr.replies.length-1]
persona = $.get 'qr.persona', {}
@name = if previous then previous.name else persona.name or null
@email = if previous and !/^sage$/.test previous.email then previous.email else persona.email or null
@sub = if previous and conf['Remember Subject'] then previous.sub else if conf['Remember Subject'] then persona.sub else null
@spoiler = if previous and conf['Remember Spoiler'] then previous.spoiler else false
@com = null @com = null
[@name, @email, @sub, @spoiler] =
if previous = qr.replies[qr.replies.length-1]
[
previous.name,
if /^sage$/.test(previous.email) then null else previous.email,
if conf['Remember Subject'] then previous.sub else null,
if conf['Remember Spoiler'] then previous.spoiler else false
]
else if persona = $.get 'qr.persona', {}
[
persona.name or null,
persona.email or null,
if conf['Remember Subject'] then persona.sub or null else null,
false
]
@el = $.el 'a', @el = $.el 'a',
className: 'preview' className: 'preview'
@ -1247,10 +1238,11 @@ qr =
sage = /sage/i.test reply.email sage = /sage/i.test reply.email
# cooldown # cooldown
persona = $.get 'qr.persona', {}
persona = persona =
name: reply.name name: reply.name
email: if /^sage$/.test reply.email then null else reply.email email: if /^sage$/.test reply.email then persona.email else reply.email
sub: if conf['Remember Subject'] then reply.sub else null sub: if conf['Remember Subject'] then reply.sub else null
$.set 'qr.persona', persona $.set 'qr.persona', persona
if conf['Persistent QR'] or qr.replies.length > 1 if conf['Persistent QR'] or qr.replies.length > 1