From 55cfbf46c381b27734aa60d0e7bfee50e5206773 Mon Sep 17 00:00:00 2001 From: James Campos Date: Sun, 15 May 2011 13:10:38 -0700 Subject: [PATCH 1/5] don't clone captcha --- 4chan_x.js | 15 +++++---------- script.coffee | 16 ++++++---------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/4chan_x.js b/4chan_x.js index 4f685614a..e28bbf9d0 100644 --- a/4chan_x.js +++ b/4chan_x.js @@ -1139,13 +1139,15 @@ } }, dialog: function(link) { - var MAX_FILE_SIZE, THREAD_ID, clone, dialog, el, html, mail, name, pass, spoiler; + var MAX_FILE_SIZE, THREAD_ID, challenge, dialog, el, html, mail, name, pass, spoiler, src; MAX_FILE_SIZE = $('input[name="MAX_FILE_SIZE"]').value; THREAD_ID = g.THREAD_ID || $.x('preceding::div[@class="op"][1]', link).id; + challenge = $('input[name=recaptcha_challenge_field]').value; + src = "http://www.google.com/recaptcha/api/image?c=" + challenge; name = $('input[name=name]').value; mail = $('input[name=email]').value; pass = $('input[name=pwd]').value; - html = "
Quick Reply X
"; + html = "
Quick Reply X
"; dialog = ui.dialog('qr', { top: '0px', left: '0px' @@ -1161,15 +1163,8 @@ }); $.after($('input[name=email]', dialog), spoiler); } - clone = $('#recaptcha_widget_div').cloneNode(true); - $.append($('#qr_captcha', dialog), clone); - $.extend($('input[name=recaptcha_response_field]', clone), { - placeholder: 'Verification', - className: 'inputtext', - required: true - }); $.bind($('form', dialog), 'submit', qr.cb.submit); - $.bind($('input[name=recaptcha_response_field]', clone), 'keydown', Recaptcha.listener); + $.bind($('input[name=recaptcha_response_field]', dialog), 'keydown', Recaptcha.listener); $.append(d.body, dialog); return dialog; }, diff --git a/script.coffee b/script.coffee index 72ece2c43..0f3c3886e 100644 --- a/script.coffee +++ b/script.coffee @@ -898,6 +898,8 @@ qr = #maybe should be global MAX_FILE_SIZE = $('input[name="MAX_FILE_SIZE"]').value THREAD_ID = g.THREAD_ID or $.x('preceding::div[@class="op"][1]', link).id + challenge = $('input[name=recaptcha_challenge_field]').value + src = "http://www.google.com/recaptcha/api/image?c=#{challenge}" name = $('input[name=name]').value mail = $('input[name=email]').value pass = $('input[name=pwd]').value @@ -911,10 +913,12 @@ qr =
+
-
+
+
@@ -931,16 +935,8 @@ qr = innerHTML: " [Spoiler Image?]" $.after $('input[name=email]', dialog), spoiler - # TODO try w/o cloning - clone = $('#recaptcha_widget_div').cloneNode(true) - $.append $('#qr_captcha', dialog), clone - $.extend $('input[name=recaptcha_response_field]', clone), - placeholder: 'Verification' - className: 'inputtext' - required: true - $.bind $('form', dialog), 'submit', qr.cb.submit - $.bind $('input[name=recaptcha_response_field]', clone), 'keydown', Recaptcha.listener + $.bind $('input[name=recaptcha_response_field]', dialog), 'keydown', Recaptcha.listener $.append d.body, dialog From 6076a923e3a23241c5d82fee1a1ac283c812a16f Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 16 May 2011 01:16:12 +0200 Subject: [PATCH 2/5] Position recaptcha buttons. --- 4chan_x.js | 36 ++++++++++++++---------------------- script.coffee | 41 +++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/4chan_x.js b/4chan_x.js index e28bbf9d0..bc380860d 100644 --- a/4chan_x.js +++ b/4chan_x.js @@ -1147,7 +1147,7 @@ name = $('input[name=name]').value; mail = $('input[name=email]').value; pass = $('input[name=pwd]').value; - html = "
Quick Reply X
"; + html = "
Quick Reply X
"; dialog = ui.dialog('qr', { top: '0px', left: '0px' @@ -2544,32 +2544,24 @@ color: grey;\ }\ /* qr reCAPTCHA */\ - #qr_captcha input {\ - border: 1px solid #AAA !important;\ - margin-top: 2px;\ - padding: 2px 4px 3px;\ + #qr_captcha {\ + border: 1px solid #AAA;\ }\ - #qr tr {\ - height: auto;\ - }\ - #qr .recaptchatable #recaptcha_image {\ - border: 1px solid #AAA !important;\ - }\ - #qr #recaptcha_reload, #qr #recaptcha_switch_audio, #qr #recaptcha_whatsthis {\ - height: 0px;\ - width: 0px;\ - padding: 19px 12px 0px 0px !important;\ - margin-left: -16px;\ + #qr_imgs {\ position: relative;\ }\ - #recaptcha_reload {\ - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAcUlEQVQY02P4z4AKGYKhNJQKYzgIZjxn+I8kwdCGrAkuwRAOZrUwhKBL7GP4ziCPYg8jROI/wzQ0B1yBSXiiCKeBjAMbhab+P0gExFCHu3o3QxzIwSC/MCC5+hPDezDdjOzB/ww/wYw9DCGoPt+CHjQAYxCCmpNUoxoAAAAASUVORK5CYII=) no-repeat center;\ + .qr_captcha_btn {\ + position: absolute;\ + right: 1px;\ }\ - #recaptcha_switch_audio {\ - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAVUlEQVQYV42NMQ6AMAwDPbTQjQEE//8OPCqkhgZXMJBTJMc3BCjBJrlA6uNL1Np6MTordq+N+cLAotHKlxhk/4lMjMu43M9z4CKRmSoJEarqxDOTHidPWTEdrdlTpwAAAABJRU5ErkJggg==) no-repeat center;\ + a.qr_captcha_btn#recaptcha_reload_btn {\ + top: 1px;\ }\ - #recaptcha_whatsthis {\ - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAk0lEQVQYV3WMsQ3CMBBFf0ECmYDJqIkFk0TpkcgEUCeegWzADoi0yQbm3cUFBeifrX/vWZZ2f+K4UlDURCKtcua4VfpK64oJDg/a66zFe1hFpN7AHWvnIprY8nPSk9zpVxcTLYukmXZynEWp3peXLpxV9CrF1L6OtDGL2kTB1QBmPTj2pIEUJkwdNehNBpphxOZ3PgIeQ0jaC7S6AAAAAElFTkSuQmCC) no-repeat center;\ + a.qr_captcha_btn#recaptcha_switch_audio_btn {\ + top: 21px;\ + }\ + a.qr_captcha_btn#recaptcha_whatsthis_btn {\ + bottom: 3px;\ }\ \ #updater {\ diff --git a/script.coffee b/script.coffee index 0f3c3886e..55f72d853 100644 --- a/script.coffee +++ b/script.coffee @@ -917,7 +917,12 @@ qr =
-
+
+ + + + +
@@ -2010,32 +2015,24 @@ main = color: grey; } /* qr reCAPTCHA */ - #qr_captcha input { - border: 1px solid #AAA !important; - margin-top: 2px; - padding: 2px 4px 3px; + #qr_captcha { + border: 1px solid #AAA; } - #qr tr { - height: auto; - } - #qr .recaptchatable #recaptcha_image { - border: 1px solid #AAA !important; - } - #qr #recaptcha_reload, #qr #recaptcha_switch_audio, #qr #recaptcha_whatsthis { - height: 0px; - width: 0px; - padding: 19px 12px 0px 0px !important; - margin-left: -16px; + #qr_imgs { position: relative; } - #recaptcha_reload { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAcUlEQVQY02P4z4AKGYKhNJQKYzgIZjxn+I8kwdCGrAkuwRAOZrUwhKBL7GP4ziCPYg8jROI/wzQ0B1yBSXiiCKeBjAMbhab+P0gExFCHu3o3QxzIwSC/MCC5+hPDezDdjOzB/ww/wYw9DCGoPt+CHjQAYxCCmpNUoxoAAAAASUVORK5CYII=) no-repeat center; + .qr_captcha_btn { + position: absolute; + right: 1px; } - #recaptcha_switch_audio { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAVUlEQVQYV42NMQ6AMAwDPbTQjQEE//8OPCqkhgZXMJBTJMc3BCjBJrlA6uNL1Np6MTordq+N+cLAotHKlxhk/4lMjMu43M9z4CKRmSoJEarqxDOTHidPWTEdrdlTpwAAAABJRU5ErkJggg==) no-repeat center; + a.qr_captcha_btn#recaptcha_reload_btn { + top: 1px; } - #recaptcha_whatsthis { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAk0lEQVQYV3WMsQ3CMBBFf0ECmYDJqIkFk0TpkcgEUCeegWzADoi0yQbm3cUFBeifrX/vWZZ2f+K4UlDURCKtcua4VfpK64oJDg/a66zFe1hFpN7AHWvnIprY8nPSk9zpVxcTLYukmXZynEWp3peXLpxV9CrF1L6OtDGL2kTB1QBmPTj2pIEUJkwdNehNBpphxOZ3PgIeQ0jaC7S6AAAAAElFTkSuQmCC) no-repeat center; + a.qr_captcha_btn#recaptcha_switch_audio_btn { + top: 21px; + } + a.qr_captcha_btn#recaptcha_whatsthis_btn { + bottom: 3px; } #updater { From 633b303a589402ee78b1ad404af7d480837a0d75 Mon Sep 17 00:00:00 2001 From: James Campos Date: Sun, 15 May 2011 23:50:35 -0700 Subject: [PATCH 3/5] close tags correctly --- script.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script.coffee b/script.coffee index 55f72d853..172a10d2e 100644 --- a/script.coffee +++ b/script.coffee @@ -921,8 +921,8 @@ qr = - - + +
From e0cbad5fc934f0771ef4462944a7bb0daf3e4afc Mon Sep 17 00:00:00 2001 From: James Campos Date: Mon, 16 May 2011 00:11:29 -0700 Subject: [PATCH 4/5] no captcha buttons --- 4chan_x.js | 24 ++++-------------------- script.coffee | 29 ++++------------------------- 2 files changed, 8 insertions(+), 45 deletions(-) diff --git a/4chan_x.js b/4chan_x.js index bc380860d..6419d952c 100644 --- a/4chan_x.js +++ b/4chan_x.js @@ -1147,7 +1147,7 @@ name = $('input[name=name]').value; mail = $('input[name=email]').value; pass = $('input[name=pwd]').value; - html = "
Quick Reply X
"; + html = "
Quick Reply X
"; dialog = ui.dialog('qr', { top: '0px', left: '0px' @@ -2051,8 +2051,8 @@ } return _results; } else if (target.id === 'recaptcha_challenge_field' && (dialog = $('#qr'))) { - $('#recaptcha_image img', dialog).src = "http://www.google.com/recaptcha/api/image?c=" + target.value; - return $('#recaptcha_challenge_field', dialog).value = target.value; + $('img', dialog).src = "http://www.google.com/recaptcha/api/image?c=" + target.value; + return $('input[name=recaptcha_challenge_field]', dialog).value = target.value; } }; imageHover = { @@ -2544,25 +2544,9 @@ color: grey;\ }\ /* qr reCAPTCHA */\ - #qr_captcha {\ + #qr img {\ border: 1px solid #AAA;\ }\ - #qr_imgs {\ - position: relative;\ - }\ - .qr_captcha_btn {\ - position: absolute;\ - right: 1px;\ - }\ - a.qr_captcha_btn#recaptcha_reload_btn {\ - top: 1px;\ - }\ - a.qr_captcha_btn#recaptcha_switch_audio_btn {\ - top: 21px;\ - }\ - a.qr_captcha_btn#recaptcha_whatsthis_btn {\ - bottom: 3px;\ - }\ \ #updater {\ position: fixed;\ diff --git a/script.coffee b/script.coffee index 172a10d2e..f88d2418c 100644 --- a/script.coffee +++ b/script.coffee @@ -917,12 +917,7 @@ qr =
-
- - - - -
+
@@ -1597,8 +1592,8 @@ nodeInserted = (e) -> for callback in g.callbacks callback target else if target.id is 'recaptcha_challenge_field' and dialog = $ '#qr' - $('#recaptcha_image img', dialog).src = "http://www.google.com/recaptcha/api/image?c=" + target.value - $('#recaptcha_challenge_field', dialog).value = target.value + $('img', dialog).src = "http://www.google.com/recaptcha/api/image?c=" + target.value + $('input[name=recaptcha_challenge_field]', dialog).value = target.value imageHover = init: -> @@ -2015,25 +2010,9 @@ main = color: grey; } /* qr reCAPTCHA */ - #qr_captcha { + #qr img { border: 1px solid #AAA; } - #qr_imgs { - position: relative; - } - .qr_captcha_btn { - position: absolute; - right: 1px; - } - a.qr_captcha_btn#recaptcha_reload_btn { - top: 1px; - } - a.qr_captcha_btn#recaptcha_switch_audio_btn { - top: 21px; - } - a.qr_captcha_btn#recaptcha_whatsthis_btn { - bottom: 3px; - } #updater { position: fixed; From 1687dd30aa820c772ad93a1d67e64863dfea01a3 Mon Sep 17 00:00:00 2001 From: James Campos Date: Mon, 16 May 2011 00:12:46 -0700 Subject: [PATCH 5/5] minor css cleanup --- 4chan_x.js | 3 --- script.coffee | 3 --- 2 files changed, 6 deletions(-) diff --git a/4chan_x.js b/4chan_x.js index 6419d952c..cb22138e7 100644 --- a/4chan_x.js +++ b/4chan_x.js @@ -2518,9 +2518,6 @@ #qr_form {\ clear: both;\ }\ - #qr #recaptcha_table td:nth-of-type(3) {/* captcha logos */\ - display: none;\ - }\ #qr form, #qr #com_submit, #qr input[type="file"] {\ margin: 0px;\ }\ diff --git a/script.coffee b/script.coffee index f88d2418c..728da554b 100644 --- a/script.coffee +++ b/script.coffee @@ -1984,9 +1984,6 @@ main = #qr_form { clear: both; } - #qr #recaptcha_table td:nth-of-type(3) {/* captcha logos */ - display: none; - } #qr form, #qr #com_submit, #qr input[type="file"] { margin: 0px; }