Merge branch 'master' into v3

4chan_x.user.js

@@ -20,7 +20,7 @@
 // @icon         data:image/gif;base64,R0lGODlhEAAQAKECAAAAAGbMM////////yH5BAEKAAIALAAAAAAQABAAAAIxlI+pq+D9DAgUoFkPDlbs7lGiI2bSVnKglnJMOL6omczxVZK3dH/41AG6Lh7i6qUoAAA7
 // ==/UserScript==
 
-/* 4chan X Beta - Version 3.0.0 - 2013-02-28
+/* 4chan X Beta - Version 3.0.0 - 2013-03-01
  * http://mayhemydg.github.com/4chan-x/
  *
  * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
@@ -3025,14 +3025,10 @@
     image: function(board, filename) {
       switch ("" + board) {
         case 'a':
-        case 'co':
         case 'jp':
         case 'm':
         case 'q':
-        case 'sp':
         case 'tg':
-        case 'tv':
-        case 'v':
         case 'vg':
         case 'wsg':
           return "//archive.foolz.us/" + board + "/full_image/" + filename;
@@ -3043,19 +3039,13 @@
         case 'ck':
         case 'lit':
           return "//fuuka.warosu.org/" + board + "/full_image/" + filename;
-        case 'diy':
-        case 'sci':
-          return "//archive.installgentoo.net/" + board + "/full_image/" + filename;
         case 'cgl':
         case 'g':
         case 'mu':
         case 'w':
           return "//rbt.asia/" + board + "/full_image/" + filename;
         case 'an':
-        case 'fit':
         case 'k':
-        case 'mlp':
-        case 'r9k':
         case 'toy':
         case 'x':
           return "http://archive.heinessen.com/" + board + "/full_image/" + filename;
@@ -3100,12 +3090,9 @@
         case 'v':
         case 'vg':
         case 'wsg':
-        case 'dev':
-        case 'foolz':
           url = Redirect.path('//archive.foolz.us', 'foolfuuka', data);
           break;
         case 'u':
-        case 'kuku':
           url = Redirect.path('//nsfw.foolz.us', 'foolfuuka', data);
           break;
         case 'int':

changelog

@@ -58,6 +58,8 @@ beta
   Fix user ID highlighting on fetched posts.
 
 master
+- Mayhem
+  Add Import/Export settings.
 
 2.38.1
 - Mayhem

src/features.coffee

@@ -1711,7 +1711,7 @@ Redirect =
   image: (board, filename) ->
     # Do not use g.BOARD, the image url can originate from a cross-quote.
     switch "#{board}"
-      when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg'
+      when 'a', 'jp', 'm', 'q', 'tg', 'vg', 'wsg'
         "//archive.foolz.us/#{board}/full_image/#{filename}"
       when 'u'
         "//nsfw.foolz.us/#{board}/full_image/#{filename}"
@@ -1719,11 +1719,9 @@ Redirect =
         "//archive.thedarkcave.org/#{board}/full_image/#{filename}"
       when 'ck', 'lit'
         "//fuuka.warosu.org/#{board}/full_image/#{filename}"
-      when 'diy', 'sci'
-        "//archive.installgentoo.net/#{board}/full_image/#{filename}"
       when 'cgl', 'g', 'mu', 'w'
         "//rbt.asia/#{board}/full_image/#{filename}"
-      when 'an', 'fit', 'k', 'mlp', 'r9k', 'toy', 'x'
+      when 'an', 'k', 'toy', 'x'
         "http://archive.heinessen.com/#{board}/full_image/#{filename}"
       when 'c'
         "//archive.nyafuu.org/#{board}/full_image/#{filename}"
@@ -1740,9 +1738,9 @@ Redirect =
   to: (data) ->
     {board} = data
     switch "#{board}"
-      when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
+      when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg'
         url = Redirect.path '//archive.foolz.us', 'foolfuuka', data
-      when 'u', 'kuku'
+      when 'u'
         url = Redirect.path '//nsfw.foolz.us', 'foolfuuka', data
       when 'int', 'po'
         url = Redirect.path '//archive.thedarkcave.org', 'foolfuuka', data