From dea5bebe7dfac7c6784e9b7ed0ef3560fce0e4d4 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Thu, 29 Sep 2011 17:05:59 -0700
Subject: [PATCH] reset

---
 4chan_x.user.js | 20 +++++++++++---------
 script.coffee   | 16 +++++++++-------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index fd728ae0c..aba59d483 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1586,17 +1586,13 @@
       }
     },
     dialog: function(text, tid) {
-      var c, l, m, qr, ta;
+      var l, qr, ta;
       if (text == null) {
         text = '';
       }
       tid || (tid = g.THREAD_ID || '');
       QR.qr = qr = ui.dialog('qr', 'top: 0; right: 0;', "    <a class=close>X</a>    <input type=checkbox id=autohide title=autohide>    <div class=move>      <span id=qr_stats></span>    </div>    <div class=autohide>      <span class=wat><img src=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41Ljg3O4BdAAAAXUlEQVQ4T2NgoAH4DzQTHyZoJckGENJASB6nc9GdCjdo6tSptkCsCPUqVgNAmtFtxiYGUkO0QrBibOqJtWkIGYDTqTgSGOnRiGYQ3mRLKBFhjUZiNCGrIZg3aKsAAGu4rTMFLFBMAAAAAElFTkSuQmCC></span>      <input form=qr_form placeholder=Name name=name>      <input form=qr_form placeholder=Email name=email>      <input form=qr_form placeholder=Subject name=sub>      <ul id=files></ul>      <form enctype=multipart/form-data method=post action=http://sys.4chan.org/" + g.BOARD + "/post target=iframe id=qr_form>        <textarea placeholder=Comment name=com></textarea>        <div hidden>          <input name=pwd>          <input name=mode value=regist>          <input name=recaptcha_challenge_field id=challenge>          <input name=recaptcha_response_field id=response>        </div>        <div id=captcha>          <div><img></div>          <input id=recaptcha_response_field autocomplete=off>        </div>        <div>          <button>Submit</button>          " + (g.REPLY ? "<label>[<input type=checkbox id=autopost title=autopost> Autopost]</label>" : '') + "          <input form=qr_form placeholder=Thread name=resto value=" + tid + " " + (g.REPLY ? 'hidden' : '') + ">          " + QR.spoiler + "        </div>      </form>    </div>    <a class=error></a>    ");
-      c = d.cookie;
-      $('[name=name]', qr).value = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
-      $('[name=email]', qr).value = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
-      $('[name=pwd]', qr).value = (m = c.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $('input[name=pwd]').value;
-      $('textarea', qr).value = text;
+      QR.reset();
       if (conf['Cooldown']) {
         QR.cooldown();
       }
@@ -1697,13 +1693,19 @@
       }
     },
     reset: function() {
-      var _ref;
+      var c, m, qr, _ref;
+      qr = QR.qr;
+      c = d.cookie;
+      $('[name=name]', qr).value = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
+      $('[name=email]', qr).value = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
+      $('[name=pwd]', qr).value = (m = c.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $('input[name=pwd]').value;
+      $('[name=sub]', qr).value = '';
       if (!conf['Remember Spoiler']) {
-        if ((_ref = $('[name=spoiler]', QR.qr)) != null) {
+        if ((_ref = $('[name=spoiler]', qr)) != null) {
           _ref.checked = false;
         }
       }
-      return $('textarea', QR.qr).value = '';
+      return $('textarea', qr).value = '';
     },
     submit: function(e) {
       var captcha, challenge, el, id, input, op, qr, response;
diff --git a/script.coffee b/script.coffee
index 9abc1e96c..fc0874b33 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1182,11 +1182,7 @@ QR =
     <a class=error></a>
     "
     #XXX use dom methods to set values instead of injecting raw user input into your html -_-;
-    c = d.cookie
-    $('[name=name]', qr).value  = if m = c.match(/4chan_name=([^;]+)/)  then decodeURIComponent m[1] else ''
-    $('[name=email]', qr).value = if m = c.match(/4chan_email=([^;]+)/) then decodeURIComponent m[1] else ''
-    $('[name=pwd]', qr).value   = if m = c.match(/4chan_pass=([^;]+)/)  then decodeURIComponent m[1] else $('input[name=pwd]').value
-    $('textarea', qr).value = text
+    QR.reset()
     QR.cooldown() if conf['Cooldown']
     QR.foo()
     $.bind $('.close', qr), 'click', QR.close
@@ -1261,8 +1257,14 @@ QR =
       $.set "cooldown/#{g.BOARD}", cooldown
       QR.cooldown()
   reset: ->
-    $('[name=spoiler]', QR.qr)?.checked = false unless conf['Remember Spoiler']
-    $('textarea', QR.qr).value = ''
+    {qr} = QR
+    c = d.cookie
+    $('[name=name]', qr).value  = if m = c.match(/4chan_name=([^;]+)/)  then decodeURIComponent m[1] else ''
+    $('[name=email]', qr).value = if m = c.match(/4chan_email=([^;]+)/) then decodeURIComponent m[1] else ''
+    $('[name=pwd]', qr).value   = if m = c.match(/4chan_pass=([^;]+)/)  then decodeURIComponent m[1] else $('input[name=pwd]').value
+    $('[name=sub]', qr).value = ''
+    $('[name=spoiler]', qr)?.checked = false unless conf['Remember Spoiler']
+    $('textarea', qr).value = ''
   submit: (e) ->
     {qr} = QR
     #XXX e is undefined if method is called explicitly, eg, from auto posting