Merge branch 'master' into menu
This commit is contained in:
commit
5e9483118d
@ -1,6 +1,6 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name 4chan x
|
// @name 4chan x
|
||||||
// @version 2.33.6
|
// @version 2.33.7
|
||||||
// @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>
|
||||||
@ -23,7 +23,7 @@
|
|||||||
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
|
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
|
||||||
* Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
|
* Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
|
||||||
* http://mayhemydg.github.com/4chan-x/
|
* http://mayhemydg.github.com/4chan-x/
|
||||||
* 4chan X 2.33.6
|
* 4chan X 2.33.7
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -4281,6 +4281,7 @@
|
|||||||
url += "#" + postID;
|
url += "#" + postID;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'ck':
|
||||||
case 'lit':
|
case 'lit':
|
||||||
url = "//fuuka.warosu.org/" + path;
|
url = "//fuuka.warosu.org/" + path;
|
||||||
if (threadID && postID) {
|
if (threadID && postID) {
|
||||||
@ -4954,7 +4955,7 @@
|
|||||||
return $.globalEval(("(" + code + ")()").replace('_id_', bq.id));
|
return $.globalEval(("(" + code + ")()").replace('_id_', bq.id));
|
||||||
},
|
},
|
||||||
namespace: '4chan_x.',
|
namespace: '4chan_x.',
|
||||||
version: '2.33.6',
|
version: '2.33.7',
|
||||||
callbacks: [],
|
callbacks: [],
|
||||||
css: '\
|
css: '\
|
||||||
/* dialog styling */\
|
/* dialog styling */\
|
||||||
|
|||||||
2
Cakefile
2
Cakefile
@ -2,7 +2,7 @@
|
|||||||
{exec} = require 'child_process'
|
{exec} = require 'child_process'
|
||||||
fs = require 'fs'
|
fs = require 'fs'
|
||||||
|
|
||||||
VERSION = '2.33.6'
|
VERSION = '2.33.7'
|
||||||
|
|
||||||
HEADER = """
|
HEADER = """
|
||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
|
|||||||
@ -1,5 +1,9 @@
|
|||||||
master
|
master
|
||||||
|
|
||||||
|
2.33.7
|
||||||
|
- Mayhem
|
||||||
|
Add /ck/ archive redirection.
|
||||||
|
|
||||||
2.33.6
|
2.33.6
|
||||||
- Mayhem
|
- Mayhem
|
||||||
Update/fix archive redirection method.
|
Update/fix archive redirection method.
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
postMessage({version:'2.33.6'},'*')
|
postMessage({version:'2.33.7'},'*')
|
||||||
@ -3357,7 +3357,7 @@ Redirect =
|
|||||||
url = "//nsfw.foolz.us/#{path}/"
|
url = "//nsfw.foolz.us/#{path}/"
|
||||||
if threadID and postID
|
if threadID and postID
|
||||||
url += "##{postID}"
|
url += "##{postID}"
|
||||||
when 'lit'
|
when 'ck', 'lit'
|
||||||
url = "//fuuka.warosu.org/#{path}"
|
url = "//fuuka.warosu.org/#{path}"
|
||||||
if threadID and postID
|
if threadID and postID
|
||||||
url += "#p#{postID}"
|
url += "#p#{postID}"
|
||||||
@ -3845,7 +3845,7 @@ Main =
|
|||||||
$.globalEval "(#{code})()".replace '_id_', bq.id
|
$.globalEval "(#{code})()".replace '_id_', bq.id
|
||||||
|
|
||||||
namespace: '4chan_x.'
|
namespace: '4chan_x.'
|
||||||
version: '2.33.6'
|
version: '2.33.7'
|
||||||
callbacks: []
|
callbacks: []
|
||||||
css: '
|
css: '
|
||||||
/* dialog styling */
|
/* dialog styling */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user