diff --git a/4chan_x.js b/4chan_x.js
index 091a95514..7e838903e 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 = "
";
+ html = " ";
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;
},
@@ -2056,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 = {
@@ -2523,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;\
}\
@@ -2549,32 +2541,8 @@
color: grey;\
}\
/* qr reCAPTCHA */\
- #qr_captcha input {\
- border: 1px solid #AAA !important;\
- margin-top: 2px;\
- padding: 2px 4px 3px;\
- }\
- #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;\
- position: relative;\
- }\
- #recaptcha_reload {\
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAcUlEQVQY02P4z4AKGYKhNJQKYzgIZjxn+I8kwdCGrAkuwRAOZrUwhKBL7GP4ziCPYg8jROI/wzQ0B1yBSXiiCKeBjAMbhab+P0gExFCHu3o3QxzIwSC/MCC5+hPDezDdjOzB/ww/wYw9DCGoPt+CHjQAYxCCmpNUoxoAAAAASUVORK5CYII=) no-repeat center;\
- }\
- #recaptcha_switch_audio {\
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAVUlEQVQYV42NMQ6AMAwDPbTQjQEE//8OPCqkhgZXMJBTJMc3BCjBJrlA6uNL1Np6MTordq+N+cLAotHKlxhk/4lMjMu43M9z4CKRmSoJEarqxDOTHidPWTEdrdlTpwAAAABJRU5ErkJggg==) no-repeat center;\
- }\
- #recaptcha_whatsthis {\
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAk0lEQVQYV3WMsQ3CMBBFf0ECmYDJqIkFk0TpkcgEUCeegWzADoi0yQbm3cUFBeifrX/vWZZ2f+K4UlDURCKtcua4VfpK64oJDg/a66zFe1hFpN7AHWvnIprY8nPSk9zpVxcTLYukmXZynEWp3peXLpxV9CrF1L6OtDGL2kTB1QBmPTj2pIEUJkwdNehNBpphxOZ3PgIeQ0jaC7S6AAAAAElFTkSuQmCC) no-repeat center;\
+ #qr img {\
+ border: 1px solid #AAA;\
}\
\
#updater {\
diff --git a/script.coffee b/script.coffee
index 70f36c253..95ae6715a 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
@@ -1596,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: ->
@@ -1988,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;
}
@@ -2014,32 +2007,8 @@ main =
color: grey;
}
/* qr reCAPTCHA */
- #qr_captcha input {
- border: 1px solid #AAA !important;
- margin-top: 2px;
- padding: 2px 4px 3px;
- }
- #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;
- position: relative;
- }
- #recaptcha_reload {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAcUlEQVQY02P4z4AKGYKhNJQKYzgIZjxn+I8kwdCGrAkuwRAOZrUwhKBL7GP4ziCPYg8jROI/wzQ0B1yBSXiiCKeBjAMbhab+P0gExFCHu3o3QxzIwSC/MCC5+hPDezDdjOzB/ww/wYw9DCGoPt+CHjQAYxCCmpNUoxoAAAAASUVORK5CYII=) no-repeat center;
- }
- #recaptcha_switch_audio {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAVUlEQVQYV42NMQ6AMAwDPbTQjQEE//8OPCqkhgZXMJBTJMc3BCjBJrlA6uNL1Np6MTordq+N+cLAotHKlxhk/4lMjMu43M9z4CKRmSoJEarqxDOTHidPWTEdrdlTpwAAAABJRU5ErkJggg==) no-repeat center;
- }
- #recaptcha_whatsthis {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAk0lEQVQYV3WMsQ3CMBBFf0ECmYDJqIkFk0TpkcgEUCeegWzADoi0yQbm3cUFBeifrX/vWZZ2f+K4UlDURCKtcua4VfpK64oJDg/a66zFe1hFpN7AHWvnIprY8nPSk9zpVxcTLYukmXZynEWp3peXLpxV9CrF1L6OtDGL2kTB1QBmPTj2pIEUJkwdNehNBpphxOZ3PgIeQ0jaC7S6AAAAAElFTkSuQmCC) no-repeat center;
+ #qr img {
+ border: 1px solid #AAA;
}
#updater {