Merge branch 'master' into navigation

CHANGELOG.md

@@ -1,3 +1,13 @@
+### v1.7.33 
+*2014-05-10*
+
+**DamonGant**
+- Add Innovandalism Archive.
+
+**ccd0**
+- Update archive list.
+- Add "disabled" option when Foolz Beta is the only choice.
+
 ### v1.7.32 
 *2014-05-10*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.7.32 - 2014-05-10
+* 4chan X - Version 1.7.33 - 2014-05-10
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.7.32
+// @version      1.7.33
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/crx/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan X",
-  "version": "1.7.32",
+  "version": "1.7.33",
   "manifest_version": 2,
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "icons": {

builds/updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.32' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/crx.crx' version='1.7.33' />
   </app>
 </gupdate>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.7.32",
+  "version": "1.7.33",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",

src/Archive/Redirect.coffee

@@ -7,9 +7,9 @@ Redirect =
 
     archives = {}
     for data in Redirect.archives
-      {name, boards, files, software} = data
+      {name, boards, files, software, withCredentials} = data
       archives[name] = data
-      for boardID in boards
+      for boardID in boards when !withCredentials
         o.thread[boardID] = data unless boardID of o.thread
         o.post[boardID]   = data unless boardID of o.post   or software isnt 'foolfuuka'
         o.file[boardID]   = data unless boardID of o.file   or boardID  not in files

src/Archive/archives.json

@@ -6,7 +6,7 @@
   "https": true,
   "software": "foolfuuka",
   "boards": ["a", "biz", "co", "diy", "gd", "jp", "m", "sci", "sp", "tg", "tv", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "biz", "gd", "diy", "jp", "m", "sci", "tg", "vg", "vp", "vr", "wsg"]
+  "files": ["a", "biz", "diy", "gd", "jp", "m", "sci", "tg", "vg", "vp", "vr", "wsg"]
 }, {
   "uid": 1,
   "name": "NSFW Foolz",
@@ -65,7 +65,7 @@
   "uid": 8,
   "name": "Rebecca Black Tech",
   "domain": "rbt.asia",
-  "http": true,
+  "http": false,
   "https": true,
   "software": "fuuka",
   "boards": ["cgl", "g", "mu", "w"],
@@ -78,7 +78,7 @@
   "https": false,
   "software": "fuuka",
   "boards": ["an", "fit", "k", "mlp", "r9k", "toy"],
-  "files": ["an", "fit", "k", "r9k", "toy"]
+  "files": ["an", "fit", "k", "mlp", "r9k", "toy"]
 }, {
   "uid": 10,
   "name": "warosu",
@@ -115,6 +115,15 @@
   "software": "foolfuuka",
   "boards": ["g", "t"],
   "files": ["g", "t"]
+}, {
+  "uid": 19,
+  "name": "Innovandalism Archive",
+  "domain": "boards.innovandalism.eu",
+  "http": true,
+  "https": false,
+  "software": "foolfuuka",
+  "boards": ["v"],
+  "files": []
 }, {
   "uid": 13,
   "name": "Foolz Beta",
@@ -123,6 +132,6 @@
   "https": true,
   "withCredentials": true,
   "software": "foolfuuka",
-  "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "biz", "d", "diy", "gd", "jp", "m", "s4s", "sci", "tg", "u", "vg", "vp", "vr", "wsg"]
+  "boards": ["a", "biz", "co", "d", "diy", "gd", "h", "i", "jp", "m", "mlp", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
+  "files": []
 }]

src/General/Settings.coffee

@@ -307,15 +307,21 @@ Settings =
     $.on $.id('apply-css'), 'click', Settings.usercss
 
     archBoards = {}
-    for {name, boards, files, software} in Redirect.archives
+    for {name, boards, files, software, withCredentials} in Redirect.archives
       for boardID in boards
         o = archBoards[boardID] or=
-          thread: []
-          post:   []
-          file:   []
-        o.thread.push name
-        o.post.push   name if software is 'foolfuuka'
-        o.file.push   name if boardID in files
+          thread: [[], []]
+          post:   [[], []]
+          file:   [[], []]
+        i = +!!withCredentials
+        o.thread[i].push name
+        o.post[i].push   name if software is 'foolfuuka'
+        o.file[i].push   name if boardID in files
+    for boardID, o of archBoards
+      for item in ['thread', 'post', 'file']
+        if o[item][0].length is 0 and o[item][1].length isnt 0
+          o[item][0].push 'disabled'
+        o[item] = o[item][0].concat(o[item][1])
 
     rows = []
     boardOptions = []