Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into qr

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-04 03:10:34 +01:00
commit b03ecbf0b0
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
4chan_x.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan x // @name 4chan x
// @version 2.23.7 // @version 2.24.0
// @namespace aeosynth // @namespace aeosynth
// @description Adds various features. // @description Adds various features.
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com> // @copyright 2009-2011 James Campos <james.r.campos@gmail.com>
@ -16,7 +16,7 @@
* *
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com> * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
* http://mayhemydg.github.com/4chan-x/ * http://mayhemydg.github.com/4chan-x/
* 4chan X 2.23.7 * 4chan X 2.24.0
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
@ -198,7 +198,7 @@
NAMESPACE = '4chan_x.'; NAMESPACE = '4chan_x.';
VERSION = '2.23.7'; VERSION = '2.24.0';
SECOND = 1000; SECOND = 1000;
@ -2651,7 +2651,7 @@
case 'tg': case 'tg':
case 'tv': case 'tv':
case 'u': case 'u':
return "http://archivethumb.foolz.us/board/" + board + "/img/" + filename; return "http://archive.foolz.us/" + board + "/full_image/" + filename;
} }
}, },
thread: function() { thread: function() {

2
Cakefile
View File

@ -2,7 +2,7 @@
{exec} = require 'child_process' {exec} = require 'child_process'
fs = require 'fs' fs = require 'fs'
VERSION = '2.23.7' VERSION = '2.24.0'
HEADER = """ HEADER = """
// ==UserScript== // ==UserScript==

2
changelog
View File

@ -1,4 +1,6 @@
master master
2.24.0
- mayhem - mayhem
redirect 404'd pictures to archives when possible redirect 404'd pictures to archives when possible
new keybind to open the options: ctrl+o new keybind to open the options: ctrl+o

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'2.23.7'},'*'); postMessage({version:'2.24.0'},'*');

4
script.coffee
View File

@ -121,7 +121,7 @@ conf = {}
) null, config ) null, config
NAMESPACE = '4chan_x.' NAMESPACE = '4chan_x.'
VERSION = '2.23.7' VERSION = '2.24.0'
SECOND = 1000 SECOND = 1000
MINUTE = 60*SECOND MINUTE = 60*SECOND
HOUR = 60*MINUTE HOUR = 60*MINUTE
@ -2130,7 +2130,7 @@ redirect =
image: (board, filename) -> #board must be given, the image can originate from a cross-quote image: (board, filename) -> #board must be given, the image can originate from a cross-quote
switch board switch board
when 'a', 'jp', 'm', 'tg', 'tv', 'u' when 'a', 'jp', 'm', 'tg', 'tv', 'u'
"http://archivethumb.foolz.us/board/#{board}/img/#{filename}" "http://archive.foolz.us/#{board}/full_image/#{filename}"
thread: -> thread: ->
switch g.BOARD switch g.BOARD
when 'a', 'jp', 'm', 'tg', 'tv', 'u' when 'a', 'jp', 'm', 'tg', 'tv', 'u'