From ca93066d0a0dd2595be3edb7343e420e40094138 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sun, 3 Jun 2012 18:46:28 -0700
Subject: [PATCH 1/5] break up if condition

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

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 4cce42059..cf494f2c2 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1054,10 +1054,16 @@
       return $.on(d, 'keydown', Keybinds.keydown);
     },
     keydown: function(e) {
-      var key, link, o, ta, thread;
-      if (!(key = Keybinds.keyCode(e)) || /TEXTAREA|INPUT/.test(e.target.nodeName) && !(e.altKey || e.ctrlKey || e.keyCode === 27)) {
+      var key, link, o, target, thread;
+      if (!(key = Kebinds.keyCode(e))) {
         return;
       }
+      target = e.target;
+      if (/TEXTAREA|INPUT/.test(target.nodeName)) {
+        if (!(e.altKey || e.ctrlKey || e.keyCode === 27)) {
+          return;
+        }
+      }
       thread = Nav.getThread();
       switch (key) {
         case Conf.openQR:
@@ -1084,15 +1090,13 @@
           }
           break;
         case Conf.spoiler:
-          ta = e.target;
-          if (ta.nodeName !== 'TEXTAREA') {
+          if (target.nodeName !== 'TEXTAREA') {
             return;
           }
           Keybinds.tags('spoiler', ta);
           break;
         case Conf.code:
-          ta = e.target;
-          if (ta.nodeName !== 'TEXTAREA') {
+          if (target.nodeName !== 'TEXTAREA') {
             return;
           }
           Keybinds.tags('code', ta);
diff --git a/script.coffee b/script.coffee
index 8f38ca3f3..44c1765c7 100644
--- a/script.coffee
+++ b/script.coffee
@@ -793,8 +793,10 @@ Keybinds =
     $.on d, 'keydown',  Keybinds.keydown
 
   keydown: (e) ->
-    if not (key = Keybinds.keyCode(e)) or /TEXTAREA|INPUT/.test(e.target.nodeName) and not (e.altKey or e.ctrlKey or e.keyCode is 27)
-      return
+    return unless key = Kebinds.keyCode e
+    {target} = e
+    if /TEXTAREA|INPUT/.test target.nodeName
+      return unless e.altKey or e.ctrlKey or e.keyCode is 27
 
     thread = Nav.getThread()
     switch key
@@ -813,12 +815,10 @@ Keybinds =
       when Conf.submit
         QR.submit() if QR.el and !QR.status()
       when Conf.spoiler
-        ta = e.target
-        return if ta.nodeName isnt 'TEXTAREA'
+        return if target.nodeName isnt 'TEXTAREA'
         Keybinds.tags 'spoiler', ta
       when Conf.code
-        ta = e.target
-        return if ta.nodeName isnt 'TEXTAREA'
+        return if target.nodeName isnt 'TEXTAREA'
         Keybinds.tags 'code', ta
       # Thread related
       when Conf.watch

From 6c1b33ba59ba9b7d6c6e037df2eb4490956d7c8c Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sun, 3 Jun 2012 18:51:05 -0700
Subject: [PATCH 2/5] use key instead of e

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

diff --git a/4chan_x.user.js b/4chan_x.user.js
index cf494f2c2..0ef1ac65a 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1060,7 +1060,7 @@
       }
       target = e.target;
       if (/TEXTAREA|INPUT/.test(target.nodeName)) {
-        if (!(e.altKey || e.ctrlKey || e.keyCode === 27)) {
+        if (!((key === 'Esc') || (/\+/.test(key)))) {
           return;
         }
       }
diff --git a/script.coffee b/script.coffee
index 44c1765c7..31f32ec60 100644
--- a/script.coffee
+++ b/script.coffee
@@ -796,7 +796,7 @@ Keybinds =
     return unless key = Kebinds.keyCode e
     {target} = e
     if /TEXTAREA|INPUT/.test target.nodeName
-      return unless e.altKey or e.ctrlKey or e.keyCode is 27
+      return unless (key is 'Esc') or (/\+/.test key)
 
     thread = Nav.getThread()
     switch key

From 7f3b9eb5c9f416112dbb46a7d52d25376cdb615a Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sun, 3 Jun 2012 18:51:57 -0700
Subject: [PATCH 3/5] meta

---
 4chan_x.user.js | 3 +++
 script.coffee   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 0ef1ac65a..7a186f806 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1237,6 +1237,9 @@
         if (e.ctrlKey) {
           key = 'ctrl+' + key;
         }
+        if (e.metaKey) {
+          key = 'meta+' + key;
+        }
       }
       return key;
     },
diff --git a/script.coffee b/script.coffee
index 31f32ec60..aae97b628 100644
--- a/script.coffee
+++ b/script.coffee
@@ -886,8 +886,9 @@ Keybinds =
       else
         null
     if key
-      if e.altKey  then key = 'alt+' + key
+      if e.altKey  then key = 'alt+'  + key
       if e.ctrlKey then key = 'ctrl+' + key
+      if e.metaKey then key = 'meta+' + key
     key
 
   tags: (tag, ta) ->

From bdca125758e26c4ad54496ff67fc42959408165f Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sun, 3 Jun 2012 18:53:21 -0700
Subject: [PATCH 4/5] derp

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

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 7a186f806..27a3a0412 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1055,7 +1055,7 @@
     },
     keydown: function(e) {
       var key, link, o, target, thread;
-      if (!(key = Kebinds.keyCode(e))) {
+      if (!(key = Keybinds.keyCode(e))) {
         return;
       }
       target = e.target;
diff --git a/script.coffee b/script.coffee
index aae97b628..a2e3fcf7c 100644
--- a/script.coffee
+++ b/script.coffee
@@ -793,7 +793,7 @@ Keybinds =
     $.on d, 'keydown',  Keybinds.keydown
 
   keydown: (e) ->
-    return unless key = Kebinds.keyCode e
+    return unless key = Keybinds.keyCode e
     {target} = e
     if /TEXTAREA|INPUT/.test target.nodeName
       return unless (key is 'Esc') or (/\+/.test key)

From 5abc0577ec92100961a76baa653b22c727781284 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sun, 3 Jun 2012 19:10:02 -0700
Subject: [PATCH 5/5] description

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

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 27a3a0412..fa872ea90 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2287,7 +2287,7 @@
   <input type=radio name=tab hidden id=keybinds_tab>\
   <div>\
     <div class=warning><code>Keybinds</code> are disabled.</div>\
-    <div>Allowed keys: Ctrl, Alt, a-z, A-Z, 0-9, Up, Down, Right, Left.</div>\
+    <div>Allowed keys: Ctrl, Alt, Meta, a-z, A-Z, 0-9, Up, Down, Right, Left.</div>\
     <table><tbody>\
       <tr><th>Actions</th><th>Keybinds</th></tr>\
     </tbody></table>\
diff --git a/script.coffee b/script.coffee
index a2e3fcf7c..1796680d1 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1761,7 +1761,7 @@ Options =
   <input type=radio name=tab hidden id=keybinds_tab>
   <div>
     <div class=warning><code>Keybinds</code> are disabled.</div>
-    <div>Allowed keys: Ctrl, Alt, a-z, A-Z, 0-9, Up, Down, Right, Left.</div>
+    <div>Allowed keys: Ctrl, Alt, Meta, a-z, A-Z, 0-9, Up, Down, Right, Left.</div>
     <table><tbody>
       <tr><th>Actions</th><th>Keybinds</th></tr>
     </tbody></table>