From 51baf0c1fc476d169518ef23eade31712b0613ad Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sat, 16 Apr 2011 18:10:05 -0700
Subject: [PATCH] simple keybinds

---
 4chan_x.js    | 36 ++++++++++++------------------------
 script.coffee | 30 +++++++++---------------------
 2 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/4chan_x.js b/4chan_x.js
index 73e38144e..9789b80b7 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -819,7 +819,8 @@
       }
     },
     normal: function(e) {
-      var thread;
+      var id, thread, url;
+      thread = nav.getThread();
       switch (keybinds.key) {
         case 'I':
           break;
@@ -829,6 +830,10 @@
           break;
         case 'M':
           break;
+        case 'O':
+          id = thread.firstChild.id;
+          url = "http://boards.4chan.org/" + g.BOARD + "/res/" + id;
+          return location.href = url;
         case 'i':
           break;
         case 'm':
@@ -836,22 +841,23 @@
         case 'n':
           return nav.next();
         case 'o':
-          break;
+          id = thread.firstChild.id;
+          url = "http://boards.4chan.org/" + g.BOARD + "/res/" + id;
+          return GM_openInTab(url);
         case 'p':
           return nav.prev();
         case 'u':
+          updater.update();
           break;
         case 'w':
-          thread = nav.getThread();
           return watcher.toggle(thread);
         case 'x':
-          thread = nav.getThread();
-          threadHiding.toggle(thread);
+          return threadHiding.toggle(thread);
       }
     }
   };
   keyModeNormal = function(e) {
-    var bot, char, hash, height, href, image, next, prev, qrLink, rect, replies, reply, root, sign, td, thread, top, watchButton, _i, _j, _len, _len2;
+    var bot, char, hash, height, image, next, prev, qrLink, rect, replies, reply, root, td, thread, top, _i, _j, _len, _len2;
     if (e.ctrlKey || e.altKey) {
       return;
     }
@@ -950,24 +956,6 @@
           }
           return imageToggle(image);
         }
-        break;
-      case "N":
-        sign = e.shiftKey ? -1 : 1;
-        return scrollThread(sign);
-      case "O":
-        href = $("" + hash + " ~ span[id] a:last-of-type").href;
-        if (e.shiftKey) {
-          return location.href = href;
-        } else {
-          return GM_openInTab(href);
-        }
-        break;
-      case "U":
-        return updateNow();
-      case "W":
-        root = g.REPLY ? null : getThread()[0];
-        watchButton = $("span.filesize ~ img", root);
-        return watch.call(watchButton);
     }
   };
   nav = {
diff --git a/script.coffee b/script.coffee
index e1e1ec484..eac991536 100644
--- a/script.coffee
+++ b/script.coffee
@@ -601,6 +601,7 @@ keybinds =
         ta.setSelectionRange range, range
 
   normal: (e) ->
+    thread = nav.getThread()
     switch keybinds.key
       when 'I'
         #qr no text
@@ -614,6 +615,10 @@ keybinds =
       when 'M'
         #expand all
         return
+      when 'O'
+        id = thread.firstChild.id
+        url = "http://boards.4chan.org/#{g.BOARD}/res/#{id}"
+        location.href = url
       when 'i'
         #qr
         return
@@ -623,20 +628,18 @@ keybinds =
       when 'n'
         nav.next()
       when 'o'
-        #open in new tab
-        return
+        id = thread.firstChild.id
+        url = "http://boards.4chan.org/#{g.BOARD}/res/#{id}"
+        GM_openInTab url
       when 'p'
         nav.prev()
       when 'u'
-        #update now
+        updater.update()
         return
       when 'w'
-        thread = nav.getThread()
         watcher.toggle thread
       when 'x'
-        thread = nav.getThread()
         threadHiding.toggle thread
-        return
 
 keyModeNormal = (e) ->
   return if e.ctrlKey or e.altKey
@@ -708,21 +711,6 @@ keyModeNormal = (e) ->
         unless image = $ 'td.replyhl span.filesize ~ a[target]', root
           image = $ 'span.filesize ~ a[target]', root
         imageToggle image
-    when "N"
-      sign = if e.shiftKey then -1 else 1
-      scrollThread sign
-    when "O"
-      href = $("#{hash} ~ span[id] a:last-of-type").href
-      if e.shiftKey
-        location.href = href
-      else
-        GM_openInTab href
-    when "U"
-      updateNow()
-    when "W"
-      root = if g.REPLY then null else getThread()[0]
-      watchButton = $ "span.filesize ~ img", root
-      watch.call watchButton
 
 nav =
   #TODO page nav