Merge branch 'master' into qr

Conflicts:
	4chan_x.user.js
	script.coffee

4chan_x.user.js

@@ -138,6 +138,7 @@
     backlink: '>>%id',
     favicon: 'ferongr',
     hotkeys: {
+      openOptions: 'ctrl+o',
       close: 'Esc',
       spoiler: 'ctrl+s',
       openQR: 'i',
@@ -882,6 +883,9 @@
       if (!(key = keybinds.keyCode(e))) return;
       thread = nav.getThread();
       switch (key) {
+        case conf.openOptions:
+          if (!$.id('overlay')) options.dialog();
+          break;
         case conf.close:
           if (o = $.id('overlay')) {
             $.rm(o);
@@ -1508,6 +1512,7 @@ textarea.field {\
     <div class=error><code>Keybinds</code> are disabled.</div>\
     <table><tbody>\
       <tr><th>Actions</th><th>Keybinds</th></tr>\
+      <tr><td>Open Options</td><td><input name=openOptions></td></tr>\
       <tr><td>Close Options or QR</td><td><input name=close></td></tr>\
       <tr><td>Quick spoiler</td><td><input name=spoiler></td></tr>\
       <tr><td>Open QR with post number inserted</td><td><input name=openQR></td></tr>\

changelog

@@ -1,6 +1,7 @@
 master
 - mayhem
   redirect 404'd pictures to archives when possible
+  new keybind to open the options: ctrl+o
   the unread count will decrease when inlining quotes of unread posts
   the report button can open multiple popups again
   add omploader to the list of optional flavors (http://ompldr.org/upload?url1=)

script.coffee

@@ -70,6 +70,7 @@ config =
   backlink: '>>%id'
   favicon: 'ferongr'
   hotkeys:
+    openOptions:     'ctrl+o'
     close:           'Esc'
     spoiler:         'ctrl+s'
     openQR:          'i'
@@ -644,6 +645,8 @@ keybinds =
 
     thread = nav.getThread()
     switch key
+      when conf.openOptions
+        options.dialog() unless $.id 'overlay'
       when conf.close
         if o = $.id 'overlay'
           $.rm o
@@ -1159,6 +1162,7 @@ options =
     <div class=error><code>Keybinds</code> are disabled.</div>
     <table><tbody>
       <tr><th>Actions</th><th>Keybinds</th></tr>
+      <tr><td>Open Options</td><td><input name=openOptions></td></tr>
       <tr><td>Close Options or QR</td><td><input name=close></td></tr>
       <tr><td>Quick spoiler</td><td><input name=spoiler></td></tr>
       <tr><td>Open QR with post number inserted</td><td><input name=openQR></td></tr>