Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Conflicts: CHANGELOG.md LICENSE builds/4chan-X.user.js builds/crx/script.js
2013-08-04 19:02:55 -07:00 · 2013-08-04 19:02:55 -07:00 · a54bc6a076
commit a54bc6a076
parent b60ddfe907 d0bbe13172
12 changed files with 431 additions and 35 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,9 +1,15 @@
 **MayhemYDG**:
 - Fix impossibility to create new threads when in dead threads.
- Drop Opera <15 support.
 - Fix flag filtering on /sp/ and /int/.
 - Minor fixes.

+### v1.2.25
+*2013-08-04*
+
+**seaweedchan**:
+- Fix issues with having two options called `Reveal Spoilers`. 
+- Update archive.
+
 ### v1.2.24
 *2013-07-24*

--- a/2
+++ b/2
@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.24 - 2013-08-04
+* 4chan X - Version 1.2.25 - 2013-08-04
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.2.24
+// @version      1.2.25
 // @namespace    4chan-X
 // @description  Cross-browser userscript for maximum lurking on 4chan.
 // @license      MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE 
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.2.24
+// @version      1.2.25
 // @namespace    4chan-X
 // @description  Cross-browser userscript for maximum lurking on 4chan.
 // @license      MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE 
@ -19,7 +19,7 @@
 // @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
 // ==/UserScript==
 /*
-* 4chan X - Version 1.2.24 - 2013-08-04
+* 4chan X - Version 1.2.25 - 2013-08-04
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -159,7 +159,7 @@
        'Image Expansion': [true, 'Expand images.'],
        'Image Hover': [true, 'Show full image on mouseover.'],
        'Sauce': [true, 'Add sauce links to images.'],
-        'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'],
+        'Reveal Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
        'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
        'Replace PNG': [false, 'Replace pngs.'],
        'Replace JPG': [false, 'Replace jpgs.'],
@ -320,7 +320,7 @@
  doc = d.documentElement;

  g = {
-    VERSION: '1.2.24',
+    VERSION: '1.2.25',
    NAMESPACE: '4chan X.',
    boards: {},
    threads: {},
@ -6577,11 +6577,11 @@

  RevealSpoilers = {
    init: function() {
-      if (g.VIEW === 'catalog' || !Conf['Reveal Spoilers']) {
+      if (g.VIEW === 'catalog' || !Conf['Reveal Spoiler Thumbnails']) {
        return;
      }
      return Post.prototype.callbacks.push({
-        name: 'Reveal Spoilers',
+        name: 'Reveal Spoiler Thumbnails',
        cb: this.node
      });
    },
@ -8073,8 +8073,8 @@
        'http': true,
        'https': false,
        'software': 'foolfuuka',
-        'boards': ['e', 'h', 'p', 's', 'u'],
-        'files': ['e', 'h', 'p', 's', 'u']
+        'boards': ['e', 'h', 'hc', 'p', 's', 'u'],
+        'files': ['e', 'h', 'hc', 'p', 's', 'u']
      },
      'Install Gentoo': {
        'domain': 'archive.installgentoo.net',
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@ -1,6 +1,6 @@
 {
  "name": "4chan X",
-  "version": "1.2.24",
+  "version": "1.2.25",
  "manifest_version": 2,
  "description": "Cross-browser userscript for maximum lurking on 4chan.",
  "icons": {
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* 4chan X - Version 1.2.24 - 2013-08-04
+* 4chan X - Version 1.2.25 - 2013-08-04
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -139,7 +139,7 @@
        'Image Expansion': [true, 'Expand images.'],
        'Image Hover': [true, 'Show full image on mouseover.'],
        'Sauce': [true, 'Add sauce links to images.'],
-        'Reveal Spoilers': [false, 'Reveal spoiler thumbnails.'],
+        'Reveal Spoiler Thumbnails': [false, 'Replace spoiler thumbnails with the original image.'],
        'Replace GIF': [false, 'Replace thumbnail of gifs with its actual image.'],
        'Replace PNG': [false, 'Replace pngs.'],
        'Replace JPG': [false, 'Replace jpgs.'],
@ -300,7 +300,7 @@
  doc = d.documentElement;

  g = {
-    VERSION: '1.2.24',
+    VERSION: '1.2.25',
    NAMESPACE: '4chan X.',
    boards: {},
    threads: {},
@ -6555,11 +6555,11 @@

  RevealSpoilers = {
    init: function() {
-      if (g.VIEW === 'catalog' || !Conf['Reveal Spoilers']) {
+      if (g.VIEW === 'catalog' || !Conf['Reveal Spoiler Thumbnails']) {
        return;
      }
      return Post.prototype.callbacks.push({
-        name: 'Reveal Spoilers',
+        name: 'Reveal Spoiler Thumbnails',
        cb: this.node
      });
    },
@ -8056,8 +8056,8 @@
        'http': true,
        'https': false,
        'software': 'foolfuuka',
-        'boards': ['e', 'h', 'p', 's', 'u'],
-        'files': ['e', 'h', 'p', 's', 'u']
+        'boards': ['e', 'h', 'hc', 'p', 's', 'u'],
+        'files': ['e', 'h', 'hc', 'p', 's', 'u']
      },
      'Install Gentoo': {
        'domain': 'archive.installgentoo.net',
--- a/latest.js
+++ b/latest.js
@ -1 +1 @@
-postMessage({version:'1.2.24'},'*')
+postMessage({version:'1.2.25'},'*')
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "4chan-X",
-  "version": "1.2.24",
+  "version": "1.2.25",
  "description": "Cross-browser userscript for maximum lurking on 4chan.",
  "meta": {
    "name": "4chan X",
--- a/src/Archive/Redirect.coffee
+++ b/src/Archive/Redirect.coffee
@ -73,8 +73,8 @@ Redirect =
      'http':  true
      'https': false
      'software': 'foolfuuka'
-      'boards': ['e', 'h', 'p', 's', 'u']
-      'files':  ['e', 'h', 'p', 's', 'u']
+      'boards': ['e', 'h', 'hc', 'p', 's', 'u']
+      'files':  ['e', 'h', 'hc', 'p', 's', 'u']

    'Install Gentoo':
      'domain': 'archive.installgentoo.net'
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@ -145,9 +145,9 @@ Config =
        true
        'Add sauce links to images.'
      ]
-      'Reveal Spoilers': [
+      'Reveal Spoiler Thumbnails': [
        false
-        'Reveal spoiler thumbnails.'
+        'Replace spoiler thumbnails with the original image.'
      ]
      'Replace GIF': [
        false
--- a/src/Images/RevealSpoilers.coffee
+++ b/src/Images/RevealSpoilers.coffee
@ -1,9 +1,9 @@
 RevealSpoilers =
  init: ->
-    return if g.VIEW is 'catalog' or !Conf['Reveal Spoilers']
+    return if g.VIEW is 'catalog' or !Conf['Reveal Spoiler Thumbnails']

    Post::callbacks.push
-      name: 'Reveal Spoilers'
+      name: 'Reveal Spoiler Thumbnails'
      cb:   @node
  node: ->
    return if @isClone or !@file?.isSpoiler