From b4c43a10bb881111bd10d0e57ef40b9ea03c636f Mon Sep 17 00:00:00 2001 From: James Campos Date: Sat, 3 Sep 2011 00:29:14 -0700 Subject: [PATCH] QR.el -> QR.qr --- 4chan_x.user.js | 69 +++++++++++++++++++++++++------------------------ script.coffee | 65 +++++++++++++++++++++++----------------------- 2 files changed, 68 insertions(+), 66 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index c950b999e..200be0d0f 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1259,13 +1259,13 @@ if (conf['Persistent QR']) { QR.dialog(); if (conf['Auto Hide QR']) { - return $('#autohide', QR.el).checked = true; + return $('#autohide', QR.qr).checked = true; } } }, attach: function() { var div, file; - $('#auto', QR.el).checked = true; + $('#auto', QR.qr).checked = true; div = $.el('div', { innerHTML: "X" }); @@ -1274,13 +1274,13 @@ $.bind($('a', div), 'click', function() { return $.rm(this.parentNode); }); - $.append($('#files', QR.el), div); + $.append($('#files', QR.qr), div); return file.click(); }, attachNext: function() { var file, oldFile; - oldFile = $('[type=file]', QR.el); - if (file = $('#files input', QR.el)) { + oldFile = $('[type=file]', QR.qr); + if (file = $('#files input', QR.qr)) { $.rm(file.parentNode); } else { file = $.el('input', { @@ -1300,7 +1300,7 @@ captchaNode: function(e) { var c; c = e.target.value; - $('img', QR.el).src = "http://www.google.com/recaptcha/api/image?c=" + c; + $('img', QR.qr).src = "http://www.google.com/recaptcha/api/image?c=" + c; return QR.captcha = { challenge: c, time: Date.now() @@ -1327,7 +1327,7 @@ } } $.set('captchas', captchas); - $('#cl', QR.el).textContent = captchas.length; + $('#cl', QR.qr).textContent = captchas.length; return captcha; }, change: function() { @@ -1335,18 +1335,18 @@ return QR.attach(); }, close: function() { - $.rm(QR.el); - return QR.el = null; + $.rm(QR.qr); + return QR.qr = null; }, cooldown: function() { var b, n, now; - if (!QR.el) { + if (!QR.qr) { return; } cooldown = $.get("cooldown/" + g.BOARD, 0); now = Date.now(); n = Math.ceil((cooldown - now) / 1000); - b = $('button', QR.el); + b = $('button', QR.qr); if (n > 0) { $.extend(b, { textContent: n, @@ -1358,35 +1358,35 @@ textContent: 'Submit', disabled: false }); - if ($('#auto', QR.el).checked) { + if ($('#auto', QR.qr).checked) { return QR.autoPost(); } } }, dialog: function(text) { - var el, l, ta; + var l, qr, ta; if (text == null) { text = ''; } - QR.el = el = ui.dialog('qr', { + QR.qr = qr = ui.dialog('qr', { top: '0', left: '0' }, " X
Quick Reply
" + QR.spoiler + "
" + ($.get('captchas', []).length) + " captchas
attach another file
"); if (conf['Cooldown']) { QR.cooldown; } - $.bind($('.close', el), 'click', QR.close); - $.bind($('form', el), 'submit', QR.submit); - $.bind($('#recaptcha_response_field', el), 'keydown', QR.keydown); - $.bind($('#attach', el), 'click', QR.attach); - $.append(d.body, el); - ta = $('textarea', el); + $.bind($('.close', qr), 'click', QR.close); + $.bind($('form', qr), 'submit', QR.submit); + $.bind($('#recaptcha_response_field', qr), 'keydown', QR.keydown); + $.bind($('#attach', qr), 'click', QR.attach); + $.append(d.body, qr); + ta = $('textarea', qr); l = text.length; ta.setSelectionRange(l, l); return ta.focus(); }, hasContent: function() { - return $('textarea', QR.el).value || $('[type=file]', QR.el).files.length; + return $('textarea', QR.qr).value || $('[type=file]', QR.qr).files.length; }, keydown: function(e) { if (!(e.keyCode === 13 && this.value)) { @@ -1401,11 +1401,11 @@ var i, ss, ta, text, v; e.preventDefault(); text = ">>" + this.textContent + "\n"; - if (!QR.el) { + if (!QR.qr) { QR.dialog(text); return; } - ta = $('textarea', QR.el); + ta = $('textarea', QR.qr); v = ta.value; ss = ta.selectionStart; ta.value = v.slice(0, ss) + text + v.slice(ss); @@ -1418,7 +1418,7 @@ data = e.data; if (data) { data = JSON.parse(data); - $.extend($('a.error', QR.el), data); + $.extend($('a.error', QR.qr), data); tc = data.textContent; if (tc === 'Error: Duplicate file entry detected.') { QR.attachNext(); @@ -1428,7 +1428,7 @@ } return; } - if (conf['Persistent QR'] || ((_ref = $('#files input', QR.el)) != null ? _ref.files.length : void 0)) { + if (conf['Persistent QR'] || ((_ref = $('#files input', QR.qr)) != null ? _ref.files.length : void 0)) { QR.reset(); } else { QR.close(); @@ -1442,17 +1442,18 @@ reset: function() { var _ref; if (!conf['Remember Spoiler']) { - if ((_ref = $('[name=spoiler]', QR.el)) != null) { + if ((_ref = $('[name=spoiler]', QR.qr)) != null) { _ref.checked = false; } } - $('textarea', QR.el).value = ''; + $('textarea', QR.qr).value = ''; return QR.attachNext(); }, submit: function(e) { - var captcha, challenge, el, response; - $('.error', qr.el).textContent = ''; - if ((el = $('#recaptcha_response_field', QR.el)).value) { + var captcha, challenge, el, qr, response; + qr = QR.qr; + $('.error', qr).textContent = ''; + if ((el = $('#recaptcha_response_field', qr)).value) { QR.captchaPush(el); } if (!(captcha = QR.captchaShift())) { @@ -1463,13 +1464,13 @@ return; } challenge = captcha.challenge, response = captcha.response; - $('#challenge', QR.el).value = challenge; - $('#response', QR.el).value = response; + $('#challenge', qr).value = challenge; + $('#response', qr).value = response; if (conf['Auto Hide QR']) { - $('#autohide', QR.el).checked = true; + $('#autohide', qr).checked = true; } if (!e) { - return $('#qr_form', QR.el).submit(); + return $('#qr_form', qr).submit(); } }, sys: function() { diff --git a/script.coffee b/script.coffee index c58400099..4d2742b42 100644 --- a/script.coffee +++ b/script.coffee @@ -988,19 +988,19 @@ QR = if conf['Persistent QR'] QR.dialog() if conf['Auto Hide QR'] - $('#autohide', QR.el).checked = true + $('#autohide', QR.qr).checked = true attach: -> - $('#auto', QR.el).checked = true + $('#auto', QR.qr).checked = true div = $.el 'div', innerHTML: "X" file = $ 'input', div $.bind file, 'change', QR.change $.bind $('a', div), 'click', -> $.rm @parentNode - $.append $('#files', QR.el), div + $.append $('#files', QR.qr), div file.click() attachNext: -> - oldFile = $ '[type=file]', QR.el - if file = $ '#files input', QR.el + oldFile = $ '[type=file]', QR.qr + if file = $ '#files input', QR.qr $.rm file.parentNode else file = $.el 'input', @@ -1013,7 +1013,7 @@ QR = QR.submit() captchaNode: (e) -> c = e.target.value - $('img', QR.el).src = "http://www.google.com/recaptcha/api/image?c=#{c}" + $('img', QR.qr).src = "http://www.google.com/recaptcha/api/image?c=#{c}" QR.captcha = challenge: c time: Date.now() @@ -1033,20 +1033,20 @@ QR = if captcha.time > cutoff break $.set 'captchas', captchas - $('#cl', QR.el).textContent = captchas.length + $('#cl', QR.qr).textContent = captchas.length captcha change: -> $.unbind @, 'change', QR.change QR.attach() close: -> - $.rm QR.el - QR.el = null + $.rm QR.qr + QR.qr = null cooldown: -> - return unless QR.el + return unless QR.qr cooldown = $.get "cooldown/#{g.BOARD}", 0 now = Date.now() n = Math.ceil (cooldown - now) / 1000 - b = $ 'button', QR.el + b = $ 'button', QR.qr if n > 0 $.extend b, textContent: n @@ -1056,9 +1056,9 @@ QR = $.extend b, textContent: 'Submit' disabled: false - QR.autoPost() if $('#auto', QR.el).checked + QR.autoPost() if $('#auto', QR.qr).checked dialog: (text='') -> - QR.el = el = ui.dialog 'qr', top: '0', left: '0', " + QR.qr = qr = ui.dialog 'qr', top: '0', left: '0', " X
Quick Reply
@@ -1078,17 +1078,17 @@ QR = " QR.cooldown if conf['Cooldown'] - $.bind $('.close', el), 'click', QR.close - $.bind $('form', el), 'submit', QR.submit - $.bind $('#recaptcha_response_field', el), 'keydown', QR.keydown - $.bind $('#attach', el), 'click', QR.attach - $.append d.body, el - ta = $ 'textarea', el + $.bind $('.close', qr), 'click', QR.close + $.bind $('form', qr), 'submit', QR.submit + $.bind $('#recaptcha_response_field', qr), 'keydown', QR.keydown + $.bind $('#attach', qr), 'click', QR.attach + $.append d.body, qr + ta = $ 'textarea', qr l = text.length ta.setSelectionRange l, l ta.focus() hasContent: -> - $('textarea', QR.el).value or $('[type=file]', QR.el).files.length + $('textarea', QR.qr).value or $('[type=file]', QR.qr).files.length keydown: (e) -> return unless e.keyCode is 13 and @value #enter, captcha filled QR.captchaPush @ @@ -1096,10 +1096,10 @@ QR = quote: (e) -> e.preventDefault() text = ">>#{@textContent}\n" - if not QR.el + if not QR.qr QR.dialog text return - ta = $ 'textarea', QR.el + ta = $ 'textarea', QR.qr v = ta.value ss = ta.selectionStart ta.value = v[0...ss] + text + v[ss..] @@ -1110,7 +1110,7 @@ QR = {data} = e if data data = JSON.parse data - $.extend $('a.error', QR.el), data + $.extend $('a.error', QR.qr), data tc = data.textContent if tc is 'Error: Duplicate file entry detected.' QR.attachNext() @@ -1118,7 +1118,7 @@ QR = else if tc is 'You seem to have mistyped the verification.' setTimeout QR.submit, 1000 return - if conf['Persistent QR'] or $('#files input', QR.el)?.files.length + if conf['Persistent QR'] or $('#files input', QR.qr)?.files.length QR.reset() else QR.close() @@ -1127,23 +1127,24 @@ QR = $.set "cooldown/#{g.BOARD}", cooldown QR.cooldown() reset: -> - $('[name=spoiler]', QR.el)?.checked = false unless conf['Remember Spoiler'] - $('textarea', QR.el).value = '' + $('[name=spoiler]', QR.qr)?.checked = false unless conf['Remember Spoiler'] + $('textarea', QR.qr).value = '' QR.attachNext() submit: (e) -> #XXX e is undefined if we're called from QR.autoPost - $('.error', qr.el).textContent = '' - if (el = $('#recaptcha_response_field', QR.el)).value + {qr} = QR + $('.error', qr).textContent = '' + if (el = $('#recaptcha_response_field', qr)).value QR.captchaPush el if not captcha = QR.captchaShift() alert 'You forgot to type in the verification.' e?.preventDefault() return {challenge, response} = captcha - $('#challenge', QR.el).value = challenge - $('#response', QR.el).value = response - $('#autohide', QR.el).checked = true if conf['Auto Hide QR'] - $('#qr_form', QR.el).submit() if not e + $('#challenge', qr).value = challenge + $('#response', qr).value = response + $('#autohide', qr).checked = true if conf['Auto Hide QR'] + $('#qr_form', qr).submit() if not e sys: -> $.globalEval -> if node = document.querySelector('table font b')?.firstChild