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 2016-09-28 00:50:26 -07:00
commit 0d521655f8
15 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
### v1.12.3 ### v1.12.3
**v1.12.3.4** *(2016-09-28)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.crx)]
- Let board banners show. You may need to add the an exception to your ad blocker's cosmetic filters: `boards.4chan.org#@#.middlead` If you do want to hide them, you can add `.middlead {display: none;}` to custom CSS.
**v1.12.3.3** *(2016-09-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.3/builds/4chan-X-noupdate.crx)] **v1.12.3.3** *(2016-09-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.3/builds/4chan-X-noupdate.crx)]
- Fix `Loop in New Tab` and `Volume in New Tab` which were broken by a regression in v1.12.1.3. - Fix `Loop in New Tab` and `Volume in New Tab` which were broken by a regression in v1.12.1.3.

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.12.3.3 // @version 1.12.3.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.12.3.3 // @version 1.12.3.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.12.3.3', VERSION: '1.12.3.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -396,7 +396,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always", 'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false sjisPreview: false
}, },
jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'\n\n# Banner ads\n#http://s.zkcdn.net/ados.js\n#https://s.zkcdn.net/ados.js\n#http://engine.4chan-ads.org\n#https://engine.4chan-ads.org', jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '', captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S', time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id', backlink: '>>%id',
@ -1288,7 +1288,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
visibility: hidden !important;\n\ visibility: hidden !important;\n\
}\n\ }\n\
/* Ads */\n\ /* Ads */\n\
:root:not(.ads-loaded) .ad-cnt,\n\ :root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
:root:not(.ads-loaded) .ad-plea,\n\ :root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\ :root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\ :root:not(.ads-loaded) .ad-plea-bottom + hr {\n\

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

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.12.3.3 // @version 1.12.3.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.12.3.3', VERSION: '1.12.3.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -396,7 +396,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always", 'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false sjisPreview: false
}, },
jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'\n\n# Banner ads\n#http://s.zkcdn.net/ados.js\n#https://s.zkcdn.net/ados.js\n#http://engine.4chan-ads.org\n#https://engine.4chan-ads.org', jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '', captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S', time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id', backlink: '>>%id',
@ -1288,7 +1288,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
visibility: hidden !important;\n\ visibility: hidden !important;\n\
}\n\ }\n\
/* Ads */\n\ /* Ads */\n\
:root:not(.ads-loaded) .ad-cnt,\n\ :root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
:root:not(.ads-loaded) .ad-plea,\n\ :root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\ :root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\ :root:not(.ads-loaded) .ad-plea-bottom + hr {\n\

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.12.3.3 // @version 1.12.3.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.12.3.3 // @version 1.12.3.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.12.3.3', VERSION: '1.12.3.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -396,7 +396,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always", 'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false sjisPreview: false
}, },
jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'\n\n# Banner ads\n#http://s.zkcdn.net/ados.js\n#https://s.zkcdn.net/ados.js\n#http://engine.4chan-ads.org\n#https://engine.4chan-ads.org', jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\nhttp://cdn.mathjax.org\nhttps://cdn.mathjax.org\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '', captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S', time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id', backlink: '>>%id',
@ -1288,7 +1288,9 @@ body > div[style*=\" top: -10000px;\"] {\n\
visibility: hidden !important;\n\ visibility: hidden !important;\n\
}\n\ }\n\
/* Ads */\n\ /* Ads */\n\
:root:not(.ads-loaded) .ad-cnt,\n\ :root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
:root:not(.ads-loaded) .ad-plea,\n\ :root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\ :root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\ :root:not(.ads-loaded) .ad-plea-bottom + hr {\n\

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://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.12.3.3' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.12.3.4' />
</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://www.4chan-x.net/builds/4chan-X.crx' version='1.12.3.3' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.12.3.4' />
</app> </app>
</gupdate> </gupdate>

6
src/config/Config.coffee
View File

@ -791,12 +791,6 @@ Config =
'self' 'self'
'unsafe-inline' 'unsafe-inline'
'unsafe-eval' 'unsafe-eval'
# Banner ads
#http://s.zkcdn.net/ados.js
#https://s.zkcdn.net/ados.js
#http://engine.4chan-ads.org
#https://engine.4chan-ads.org
''' '''
captchaLanguage: '' captchaLanguage: ''

4
src/css/style.css
View File

@ -125,7 +125,9 @@ body > div[style*=" top: -10000px;"] {
} }
/* Ads */ /* Ads */
:root:not(.ads-loaded) .ad-cnt, :root:not(.ads-loaded) .ad-cnt > * {
height: auto;
}
:root:not(.ads-loaded) .ad-plea, :root:not(.ads-loaded) .ad-plea,
:root:not(.ads-loaded) hr.abovePostForm, :root:not(.ads-loaded) hr.abovePostForm,
:root:not(.ads-loaded) .ad-plea-bottom + hr { :root:not(.ads-loaded) .ad-plea-bottom + hr {

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.12.3.3", "version": "1.12.3.4",
"date": "2016-09-25T07:38:17.940Z" "date": "2016-09-28T07:30:05.181Z"
} }