From a64ad843a77adfd9332cd524a860924190858c72 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <mayhemydg@gmail.com>
Date: Thu, 23 Jun 2011 23:49:14 +0200
Subject: [PATCH] ^ -> ctrl+

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

diff --git a/4chan_x.user.js b/4chan_x.user.js
index b07ae8628..2ca3cb689 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -694,7 +694,7 @@
     init: function() {
       var key;
       keybinds.close = (key = $.getValue('key/close', 0)).length ? key : '<Esc>';
-      keybinds.spoiler = (key = $.getValue('key/spoiler', 0)).length ? key : '^s';
+      keybinds.spoiler = (key = $.getValue('key/spoiler', 0)).length ? key : 'ctrl+s';
       keybinds.zero = (key = $.getValue('key/zero', 0)).length ? key : '0';
       keybinds.openQR = (key = $.getValue('key/openQR', 0)).length ? key : 'i';
       keybinds.openEmptyQR = (key = $.getValue('key/openEmptyQR', 0)).length ? key : 'I';
@@ -728,7 +728,7 @@
             key = key.toLowerCase();
           }
           if (e.ctrlKey) {
-            key = '^' + key;
+            key = 'ctrl+' + key;
           }
           if (e.altKey) {
             key = 'alt+' + key;
@@ -1014,7 +1014,7 @@
       var arr, checked, description, dialog, hiddenNum, hiddenThreads, html, input, key, li, link, main, obj, overlay, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4;
       hiddenThreads = $.getValue("hiddenThreads/" + g.BOARD + "/", {});
       hiddenNum = Object.keys(g.hiddenReplies).length + Object.keys(hiddenThreads).length;
-      html = "      <div class='reply dialog'>        <div id=optionsbar>          <div id=floaty>            <a name=main>main</a> | <a name=flavors>sauce</a> | <a name=time>time</a> | <a name=keybinds>keybinds</a>          </div>          <div id=credits>            <a href=http://chat.now.im/x/aeos>support throd</a> |            <a href=https://github.com/aeosynth/4chan-x/issues>github</a> |            <a href=http://userscripts.org/scripts/show/51412>uso</a> |            <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>donate</a>          </div>        </div>        <hr>        <div id=content>          <div id=main>          </div>          <textarea style='display: none;' name=flavors id=flavors>" + ($.config('flavors')) + "</textarea>          <div style='display: none;' id=time>            <div><input type=text name=time value='" + ($.config('time')) + "'> <span id=timePreview></span></div>            <table>              <caption>Format specifiers <a href=http://en.wikipedia.org/wiki/Date_%28Unix%29#Formatting>(source)</a></caption>              <tbody>                <tr><th>Specifier</th><th>Description</th><th>Values/Example</th></tr>                <tr><td>%a</td><td>weekday, abbreviated</td><td>Sat</td></tr>                <tr><td>%A</td><td>weekday, full</td><td>Saturday</td></tr>                <tr><td>%b</td><td>month, abbreviated</td><td>Jun</td></tr>                <tr><td>%B</td><td>month, full length</td><td>June</td></tr>                <tr><td>%d</td><td>day of the month, zero padded</td><td>03</td></tr>                <tr><td>%H</td><td>hour (24 hour clock) zero padded</td><td>13</td></tr>                <tr><td>%I (uppercase i)</td><td>hour (12 hour clock) zero padded</td><td>02</td></tr>                <tr><td>%m</td><td>month, zero padded</td><td>06</td></tr>                <tr><td>%M</td><td>minutes, zero padded</td><td>54</td></tr>                <tr><td>%p</td><td>upper case AM or PM</td><td>PM</td></tr>                <tr><td>%P</td><td>lower case am or pm</td><td>pm</td></tr>                <tr><td>%y</td><td>two digit year</td><td>00-99</td></tr>              </tbody>            </table>          </div>          <div style='display: none;' id=keybinds>            <table>              <tbody>                <tr><th>Actions</th><th>Keybinds</th></tr>                <tr><td>Close Options or QR</td><td><input type=text name=close value='<Esc>'></td></tr>                <tr><td>Quick spoiler</td><td><input type=text name=spoiler value='^s'></td></tr>                <tr><td>Jump to page 0</td><td><input type=text name=zero value='0'></td></tr>                <tr><td>Open QR with post number inserted</td><td><input type=text name=openQR value='i'></td></tr>                <tr><td>Open QR without post number inserted</td><td><input type=text name=openEmptyQR value='I'></td></tr>                <tr><td>Select next reply</td><td><input type=text name=nextReply value='J'></td></tr>                <tr><td>Select previous reply</td><td><input type=text name=previousReply value='K'></td></tr>                <tr><td>See next thread</td><td><input type=text name=nextThread value='n'></td></tr>                <tr><td>See previous thread</td><td><input type=text name=previousThread value='p'></td></tr>                <tr><td>Open thread in current tab</td><td><input type=text name=openThread value='O'></td></tr>                <tr><td>Open thread in new tab</td><td><input type=text name=openThreadTab value='o'></td></tr>                <tr><td>Expand thread</td><td><input type=text name=expandThread value='e'></td></tr>                <tr><td>Watch thread</td><td><input type=text name=watch value='w'></td></tr>                <tr><td>Hide thread</td><td><input type=text name=hide value='x'></td></tr>                <tr><td>Expand selected image</td><td><input type=text name=expandImages value='m'></td></tr>                <tr><td>Expand all images</td><td><input type=text name=expandAllImages value='M'></td></tr>                <tr><td>Update now</td><td><input type=text name=update value='u'></td></tr>              </tbody>            </table>          </div>        </div>      </div>    ";
+      html = "      <div class='reply dialog'>        <div id=optionsbar>          <div id=floaty>            <a name=main>main</a> | <a name=flavors>sauce</a> | <a name=time>time</a> | <a name=keybinds>keybinds</a>          </div>          <div id=credits>            <a href=http://chat.now.im/x/aeos>support throd</a> |            <a href=https://github.com/aeosynth/4chan-x/issues>github</a> |            <a href=http://userscripts.org/scripts/show/51412>uso</a> |            <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>donate</a>          </div>        </div>        <hr>        <div id=content>          <div id=main>          </div>          <textarea style='display: none;' name=flavors id=flavors>" + ($.config('flavors')) + "</textarea>          <div style='display: none;' id=time>            <div><input type=text name=time value='" + ($.config('time')) + "'> <span id=timePreview></span></div>            <table>              <caption>Format specifiers <a href=http://en.wikipedia.org/wiki/Date_%28Unix%29#Formatting>(source)</a></caption>              <tbody>                <tr><th>Specifier</th><th>Description</th><th>Values/Example</th></tr>                <tr><td>%a</td><td>weekday, abbreviated</td><td>Sat</td></tr>                <tr><td>%A</td><td>weekday, full</td><td>Saturday</td></tr>                <tr><td>%b</td><td>month, abbreviated</td><td>Jun</td></tr>                <tr><td>%B</td><td>month, full length</td><td>June</td></tr>                <tr><td>%d</td><td>day of the month, zero padded</td><td>03</td></tr>                <tr><td>%H</td><td>hour (24 hour clock) zero padded</td><td>13</td></tr>                <tr><td>%I (uppercase i)</td><td>hour (12 hour clock) zero padded</td><td>02</td></tr>                <tr><td>%m</td><td>month, zero padded</td><td>06</td></tr>                <tr><td>%M</td><td>minutes, zero padded</td><td>54</td></tr>                <tr><td>%p</td><td>upper case AM or PM</td><td>PM</td></tr>                <tr><td>%P</td><td>lower case am or pm</td><td>pm</td></tr>                <tr><td>%y</td><td>two digit year</td><td>00-99</td></tr>              </tbody>            </table>          </div>          <div style='display: none;' id=keybinds>            <table>              <tbody>                <tr><th>Actions</th><th>Keybinds</th></tr>                <tr><td>Close Options or QR</td><td><input type=text name=close value='<Esc>'></td></tr>                <tr><td>Quick spoiler</td><td><input type=text name=spoiler value='ctrl+s'></td></tr>                <tr><td>Jump to page 0</td><td><input type=text name=zero value='0'></td></tr>                <tr><td>Open QR with post number inserted</td><td><input type=text name=openQR value='i'></td></tr>                <tr><td>Open QR without post number inserted</td><td><input type=text name=openEmptyQR value='I'></td></tr>                <tr><td>Select next reply</td><td><input type=text name=nextReply value='J'></td></tr>                <tr><td>Select previous reply</td><td><input type=text name=previousReply value='K'></td></tr>                <tr><td>See next thread</td><td><input type=text name=nextThread value='n'></td></tr>                <tr><td>See previous thread</td><td><input type=text name=previousThread value='p'></td></tr>                <tr><td>Open thread in current tab</td><td><input type=text name=openThread value='O'></td></tr>                <tr><td>Open thread in new tab</td><td><input type=text name=openThreadTab value='o'></td></tr>                <tr><td>Expand thread</td><td><input type=text name=expandThread value='e'></td></tr>                <tr><td>Watch thread</td><td><input type=text name=watch value='w'></td></tr>                <tr><td>Hide thread</td><td><input type=text name=hide value='x'></td></tr>                <tr><td>Expand selected image</td><td><input type=text name=expandImages value='m'></td></tr>                <tr><td>Expand all images</td><td><input type=text name=expandAllImages value='M'></td></tr>                <tr><td>Update now</td><td><input type=text name=update value='u'></td></tr>              </tbody>            </table>          </div>        </div>      </div>    ";
       dialog = $.el('div', {
         id: 'options',
         innerHTML: html
@@ -1113,7 +1113,7 @@
             key = key.toLowerCase();
           }
           if (e.ctrlKey) {
-            key = '^' + key;
+            key = 'ctrl+' + key;
           }
           if (e.altKey) {
             key = 'alt+' + key;
diff --git a/script.coffee b/script.coffee
index 9c9142055..4356217a0 100644
--- a/script.coffee
+++ b/script.coffee
@@ -490,7 +490,7 @@ replyHiding =
 keybinds =
   init: ->
     keybinds.close           = if (key = $.getValue 'key/close', 0).length then key           else '<Esc>'
-    keybinds.spoiler         = if (key = $.getValue 'key/spoiler', 0).length then key         else '^s'
+    keybinds.spoiler         = if (key = $.getValue 'key/spoiler', 0).length then key         else 'ctrl+s'
     keybinds.zero            = if (key = $.getValue 'key/zero', 0).length then key            else '0'
     keybinds.openQR          = if (key = $.getValue 'key/openQR', 0).length then key          else 'i'
     keybinds.openEmptyQR     = if (key = $.getValue 'key/openEmptyQR', 0).length then key     else 'I'
@@ -522,7 +522,7 @@ keybinds =
         key = String.fromCharCode kc
         if !e.shiftKey
           key = key.toLowerCase()
-        if e.ctrlKey then key = '^' + key
+        if e.ctrlKey then key = 'ctrl+' + key
         if e.altKey  then key = 'alt+' + key
       else
         if kc is 27
@@ -792,7 +792,7 @@ options =
               <tbody>
                 <tr><th>Actions</th><th>Keybinds</th></tr>
                 <tr><td>Close Options or QR</td><td><input type=text name=close value='<Esc>'></td></tr>
-                <tr><td>Quick spoiler</td><td><input type=text name=spoiler value='^s'></td></tr>
+                <tr><td>Quick spoiler</td><td><input type=text name=spoiler value='ctrl+s'></td></tr>
                 <tr><td>Jump to page 0</td><td><input type=text name=zero value='0'></td></tr>
                 <tr><td>Open QR with post number inserted</td><td><input type=text name=openQR value='i'></td></tr>
                 <tr><td>Open QR without post number inserted</td><td><input type=text name=openEmptyQR value='I'></td></tr>
@@ -883,7 +883,7 @@ options =
         key = String.fromCharCode kc
         if !e.shiftKey
           key = key.toLowerCase()
-        if e.ctrlKey then key = '^' + key
+        if e.ctrlKey then key = 'ctrl+' + key
         if e.altKey  then key = 'alt+' + key
       else
         if kc is 27