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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2015-02-22 00:11:55 -08:00
commit dabfb1f330
16 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.1 ### v1.10.1
**v1.10.1.14** *(2015-02-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.14/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.14/builds/4chan-X-noupdate.crx "Chromium version")]
- Add Admin Emeritus capcode.
**v1.10.1.13** *(2015-02-21)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.crx "Chromium version")] **v1.10.1.13** *(2015-02-21)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.crx "Chromium version")]
- Focus on checkbox when captcha is tabbed into. - Focus on checkbox when captcha is tabbed into.

2
Gruntfile.coffee
View File

@ -30,7 +30,7 @@ module.exports = (grunt) ->
assert = (statement, objs...) -> assert = (statement, objs...) ->
return '' unless grunt.config('pkg').tests_enabled return '' unless grunt.config('pkg').tests_enabled
"throw new Error 'Assertion failed: ' + `#{json statement}` unless #{statement}" "throw new Error 'Assertion failed: ' + #{json statement} unless #{statement}"
# Project configuration. # Project configuration.
grunt.initConfig grunt.initConfig

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.10.1.13 * 4chan X - Version 1.10.1.14
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.10.1.13 // @version 1.10.1.14
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

19
builds/4chan-X-beta.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.10.1.13 // @version 1.10.1.14
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -26,7 +26,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.10.1.13 * 4chan X - Version 1.10.1.14
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -406,7 +406,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.1.13', VERSION: '1.10.1.14',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4077,10 +4077,10 @@
case 'admin_highlight': case 'admin_highlight':
capcodeClass = ' capcodeAdmin'; capcodeClass = ' capcodeAdmin';
capcodeStart = { capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator\">## Admin</strong>" innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by Administrators\">## Admin</strong>"
}; };
capcodeIcon = { capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is the 4chan Administrator.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is a 4chan Administrator.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'mod': case 'mod':
@ -4110,6 +4110,15 @@
innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'admin_emeritus':
capcodeClass = ' capcodeAdmin';
capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator Emeritus\">## Admin Emeritus</strong>"
};
capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is 4chan&#039;s founding Administrator.\" class=\"identityIcon retina\">"
};
break;
default: default:
capcodeClass = ''; capcodeClass = '';
capcodeStart = { capcodeStart = {

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

19
builds/4chan-X-noupdate.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.10.1.13 // @version 1.10.1.14
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.10.1.13 * 4chan X - Version 1.10.1.14
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -405,7 +405,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.1.13', VERSION: '1.10.1.14',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4076,10 +4076,10 @@
case 'admin_highlight': case 'admin_highlight':
capcodeClass = ' capcodeAdmin'; capcodeClass = ' capcodeAdmin';
capcodeStart = { capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator\">## Admin</strong>" innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by Administrators\">## Admin</strong>"
}; };
capcodeIcon = { capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is the 4chan Administrator.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is a 4chan Administrator.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'mod': case 'mod':
@ -4109,6 +4109,15 @@
innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'admin_emeritus':
capcodeClass = ' capcodeAdmin';
capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator Emeritus\">## Admin Emeritus</strong>"
};
capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is 4chan&#039;s founding Administrator.\" class=\"identityIcon retina\">"
};
break;
default: default:
capcodeClass = ''; capcodeClass = '';
capcodeStart = { capcodeStart = {

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

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

19
builds/4chan-X.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.10.1.13 // @version 1.10.1.14
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -26,7 +26,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.10.1.13 * 4chan X - Version 1.10.1.14
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -406,7 +406,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.1.13', VERSION: '1.10.1.14',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
NAME: '4chan X', NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -4077,10 +4077,10 @@
case 'admin_highlight': case 'admin_highlight':
capcodeClass = ' capcodeAdmin'; capcodeClass = ' capcodeAdmin';
capcodeStart = { capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator\">## Admin</strong>" innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by Administrators\">## Admin</strong>"
}; };
capcodeIcon = { capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is the 4chan Administrator.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is a 4chan Administrator.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'mod': case 'mod':
@ -4110,6 +4110,15 @@
innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">" innerHTML: " <img src=\"" + E(staticPath) + "managericon" + E(gifIcon) + "\" alt=\"Manager Icon\" title=\"This user is a 4chan Manager.\" class=\"identityIcon retina\">"
}; };
break; break;
case 'admin_emeritus':
capcodeClass = ' capcodeAdmin';
capcodeStart = {
innerHTML: " <strong class=\"capcode hand id_admin\" title=\"Highlight posts by the Administrator Emeritus\">## Admin Emeritus</strong>"
};
capcodeIcon = {
innerHTML: " <img src=\"" + E(staticPath) + "adminicon" + E(gifIcon) + "\" alt=\"Admin Icon\" title=\"This user is 4chan&#039;s founding Administrator.\" class=\"identityIcon retina\">"
};
break;
default: default:
capcodeClass = ''; capcodeClass = '';
capcodeStart = { capcodeStart = {

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

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

2
builds/updates.xml
View File

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

2
package.json
View File

@ -3,7 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",
"version": "1.10.1.13", "version": "1.10.1.14",
"repo": "https://github.com/ccd0/4chan-x/", "repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x", "page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/", "downloads": "https://ccd0.github.io/4chan-x/builds/",

8
src/General/Build.coffee
View File

@ -86,8 +86,8 @@ Build =
switch capcode switch capcode
when 'admin', 'admin_highlight' when 'admin', 'admin_highlight'
capcodeClass = ' capcodeAdmin' capcodeClass = ' capcodeAdmin'
capcodeStart = <%= html(' <strong class="capcode hand id_admin" title="Highlight posts by the Administrator">## Admin</strong>') %> capcodeStart = <%= html(' <strong class="capcode hand id_admin" title="Highlight posts by Administrators">## Admin</strong>') %>
capcodeIcon = <%= html(' <img src="${staticPath}adminicon${gifIcon}" alt="Admin Icon" title="This user is the 4chan Administrator." class="identityIcon retina">') %> capcodeIcon = <%= html(' <img src="${staticPath}adminicon${gifIcon}" alt="Admin Icon" title="This user is a 4chan Administrator." class="identityIcon retina">') %>
when 'mod' when 'mod'
capcodeClass = ' capcodeMod' capcodeClass = ' capcodeMod'
capcodeStart = <%= html(' <strong class="capcode hand id_mod" title="Highlight posts by Moderators">## Mod</strong>') %> capcodeStart = <%= html(' <strong class="capcode hand id_mod" title="Highlight posts by Moderators">## Mod</strong>') %>
@ -100,6 +100,10 @@ Build =
capcodeClass = ' capcodeManager' capcodeClass = ' capcodeManager'
capcodeStart = <%= html(' <strong class="capcode hand id_manager" title="Highlight posts by Managers">## Manager</strong>') %> capcodeStart = <%= html(' <strong class="capcode hand id_manager" title="Highlight posts by Managers">## Manager</strong>') %>
capcodeIcon = <%= html(' <img src="${staticPath}managericon${gifIcon}" alt="Manager Icon" title="This user is a 4chan Manager." class="identityIcon retina">') %> capcodeIcon = <%= html(' <img src="${staticPath}managericon${gifIcon}" alt="Manager Icon" title="This user is a 4chan Manager." class="identityIcon retina">') %>
when 'admin_emeritus'
capcodeClass = ' capcodeAdmin'
capcodeStart = <%= html(' <strong class="capcode hand id_admin" title="Highlight posts by the Administrator Emeritus">## Admin Emeritus</strong>') %>
capcodeIcon = <%= html(' <img src="${staticPath}adminicon${gifIcon}" alt="Admin Icon" title="This user is 4chan&#039;s founding Administrator." class="identityIcon retina">') %>
else else
capcodeClass = '' capcodeClass = ''
capcodeStart = <%= html('') %> capcodeStart = <%= html('') %>