From 511d774c7a8bba1aceda44bfdc1ab213f3113870 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sat, 7 May 2011 16:16:47 -0700
Subject: [PATCH] fix submit cb, error notifications

---
 4chan_x.js    | 7 +++----
 script.coffee | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/4chan_x.js b/4chan_x.js
index b381115ef..d29a6b5db 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -1129,10 +1129,10 @@
       }
     },
     dialog: function(link) {
-      var MAX_FILE_SIZE, THREAD_ID, clone, dialog, el, form, html, spoiler;
+      var MAX_FILE_SIZE, THREAD_ID, clone, dialog, el, html, spoiler;
       MAX_FILE_SIZE = $('input[name="MAX_FILE_SIZE"]').value;
       THREAD_ID = g.THREAD_ID || link.pathname.split('/').pop();
-      html = "      <div class=move>        <input class=inputtext type=text name=name placeholder=Name form=qr_form>        Quick Reply        <input type=checkbox id=autohide title=autohide>        <a name=close title=close>X</a>      </div>      <form name=post action=http://sys.4chan.org/" + g.BOARD + "/post method=POST enctype=multipart/form-data target=iframe id=qr_form>        <input type=hidden name=MAX_FILE_SIZE value=" + MAX_FILE_SIZE + ">        <input type=hidden name=resto value=" + THREAD_ID + ">        <div><input class=inputtext type=text name=email placeholder=E-mail></div>        <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=Submit id=com_submit></div>        <div><textarea class=inputtext name=com placeholder=Comment></textarea></div>        <div id=qr_captcha></div>        <div><input type=file name=upfile></div>        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password><input type=hidden name=mode value=regist></div>      </form>      ";
+      html = "      <div class=move>        <input class=inputtext type=text name=name placeholder=Name form=qr_form>        Quick Reply        <input type=checkbox id=autohide title=autohide>        <a name=close title=close>X</a>      </div>      <form name=post action=http://sys.4chan.org/" + g.BOARD + "/post method=POST enctype=multipart/form-data target=iframe id=qr_form>        <input type=hidden name=MAX_FILE_SIZE value=" + MAX_FILE_SIZE + ">        <input type=hidden name=resto value=" + THREAD_ID + ">        <div><input class=inputtext type=text name=email placeholder=E-mail></div>        <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=Submit id=com_submit></div>        <div><textarea class=inputtext name=com placeholder=Comment></textarea></div>        <div id=qr_captcha></div>        <div><input type=file name=upfile></div>        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password><input type=hidden name=mode value=regist></div>      </form>      <div id=error class=error></div>      ";
       dialog = ui.dialog('qr', {
         top: '0px',
         left: '0px'
@@ -1155,8 +1155,7 @@
         className: 'inputtext',
         required: true
       });
-      form = dialog.lastElementChild;
-      $.bind(form, 'submit', qr.cb.submit);
+      $.bind($('form', dialog), 'submit', qr.cb.submit);
       $.bind($('input[name=recaptcha_response_field]', clone), 'keydown', Recaptcha.listener);
       $.append(d.body, dialog);
       return dialog;
diff --git a/script.coffee b/script.coffee
index 117e47d4e..c6a368a00 100644
--- a/script.coffee
+++ b/script.coffee
@@ -888,6 +888,7 @@ qr =
         <div><input type=file name=upfile></div>
         <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password><input type=hidden name=mode value=regist></div>
       </form>
+      <div id=error class=error></div>
       "
     dialog = ui.dialog 'qr', top: '0px', left: '0px', html
 
@@ -908,8 +909,7 @@ qr =
       className: 'inputtext'
       required: true
 
-    form = dialog.lastElementChild
-    $.bind form, 'submit', qr.cb.submit
+    $.bind $('form', dialog), 'submit', qr.cb.submit
     $.bind $('input[name=recaptcha_response_field]', clone), 'keydown', Recaptcha.listener
 
     $.append d.body, dialog