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-27 22:50:20 -08:00
commit cc0435ab8f
14 changed files with 66 additions and 11 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.2 ### v1.10.2
**v1.10.2.7** *(2015-02-27)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.7/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix header board list and floating embeds in older Webkit browsers such as dwb.
**v1.10.2.6** *(2015-02-27)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.6/builds/4chan-X-noupdate.crx "Chromium version")] **v1.10.2.6** *(2015-02-27)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.2.6/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix captcha stealing focus from the submit button. - Fix captcha stealing focus from the submit button.

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

17
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.2.6 // @version 1.10.2.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -393,7 +393,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.2.6', VERSION: '1.10.2.7',
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',
@ -17249,26 +17249,33 @@
"@media (min-width: 1300px) {\n" + "@media (min-width: 1300px) {\n" +
" :root.fixed:not(.centered-links) #header-bar {\n" + " :root.fixed:not(.centered-links) #header-bar {\n" +
" white-space: nowrap;\n" + " white-space: nowrap;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #board-list {\n" + " :root.fixed:not(.centered-links) #board-list {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list {\n" + " :root.fixed:not(.centered-links) #full-board-list {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) .hide-board-list-container {\n" + " :root.fixed:not(.centered-links) .hide-board-list-container {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" margin-right: 5px;\n" + " margin-right: 5px;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" padding: .17em;\n" + " padding: .17em;\n" +
" margin: -.17em -.32em;\n" + " margin: -.17em -.32em;\n" +
@ -17277,14 +17284,18 @@
" pointer-events: none;\n" + " pointer-events: none;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" +
" -webkit-flex: 0 .63 .63em;\n" +
" flex: 0 .63 .63em;\n" + " flex: 0 .63 .63em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" +
" -webkit-flex: 0 .38 .38em;\n" +
" flex: 0 .38 .38em;\n" + " flex: 0 .38 .38em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #shortcuts {\n" + " :root.fixed:not(.centered-links) #shortcuts {\n" +
" float: initial;\n" + " float: initial;\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
@ -18559,9 +18570,11 @@
" display: none;\n" + " display: none;\n" +
"}\n" + "}\n" +
"#embedding > div:first-child {\n" + "#embedding > div:first-child {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
"}\n" + "}\n" +
"#embedding .move {\n" + "#embedding .move {\n" +
" -webkit-flex: 1;\n" +
" flex: 1;\n" + " flex: 1;\n" +
"}\n" + "}\n" +
"#embedding .jump {\n" + "#embedding .jump {\n" +

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

Binary file not shown.

17
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.2.6 // @version 1.10.2.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -392,7 +392,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.2.6', VERSION: '1.10.2.7',
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',
@ -17248,26 +17248,33 @@
"@media (min-width: 1300px) {\n" + "@media (min-width: 1300px) {\n" +
" :root.fixed:not(.centered-links) #header-bar {\n" + " :root.fixed:not(.centered-links) #header-bar {\n" +
" white-space: nowrap;\n" + " white-space: nowrap;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #board-list {\n" + " :root.fixed:not(.centered-links) #board-list {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list {\n" + " :root.fixed:not(.centered-links) #full-board-list {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) .hide-board-list-container {\n" + " :root.fixed:not(.centered-links) .hide-board-list-container {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" margin-right: 5px;\n" + " margin-right: 5px;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" padding: .17em;\n" + " padding: .17em;\n" +
" margin: -.17em -.32em;\n" + " margin: -.17em -.32em;\n" +
@ -17276,14 +17283,18 @@
" pointer-events: none;\n" + " pointer-events: none;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" +
" -webkit-flex: 0 .63 .63em;\n" +
" flex: 0 .63 .63em;\n" + " flex: 0 .63 .63em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" +
" -webkit-flex: 0 .38 .38em;\n" +
" flex: 0 .38 .38em;\n" + " flex: 0 .38 .38em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #shortcuts {\n" + " :root.fixed:not(.centered-links) #shortcuts {\n" +
" float: initial;\n" + " float: initial;\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
@ -18558,9 +18569,11 @@
" display: none;\n" + " display: none;\n" +
"}\n" + "}\n" +
"#embedding > div:first-child {\n" + "#embedding > div:first-child {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
"}\n" + "}\n" +
"#embedding .move {\n" + "#embedding .move {\n" +
" -webkit-flex: 1;\n" +
" flex: 1;\n" + " flex: 1;\n" +
"}\n" + "}\n" +
"#embedding .jump {\n" + "#embedding .jump {\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.10.2.6 // @version 1.10.2.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

17
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.2.6 // @version 1.10.2.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -393,7 +393,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.10.2.6', VERSION: '1.10.2.7',
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',
@ -17249,26 +17249,33 @@
"@media (min-width: 1300px) {\n" + "@media (min-width: 1300px) {\n" +
" :root.fixed:not(.centered-links) #header-bar {\n" + " :root.fixed:not(.centered-links) #header-bar {\n" +
" white-space: nowrap;\n" + " white-space: nowrap;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #board-list {\n" + " :root.fixed:not(.centered-links) #board-list {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list {\n" + " :root.fixed:not(.centered-links) #full-board-list {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) .hide-board-list-container {\n" + " :root.fixed:not(.centered-links) .hide-board-list-container {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" margin-right: 5px;\n" + " margin-right: 5px;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList {\n" +
" -webkit-flex: auto;\n" +
" flex: auto;\n" + " flex: auto;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > a,\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" padding: .17em;\n" + " padding: .17em;\n" +
" margin: -.17em -.32em;\n" + " margin: -.17em -.32em;\n" +
@ -17277,14 +17284,18 @@
" pointer-events: none;\n" + " pointer-events: none;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {\n" +
" -webkit-flex: 0 .63 .63em;\n" +
" flex: 0 .63 .63em;\n" + " flex: 0 .63 .63em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" + " :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {\n" +
" -webkit-flex: 0 .38 .38em;\n" +
" flex: 0 .38 .38em;\n" + " flex: 0 .38 .38em;\n" +
" }\n" + " }\n" +
" :root.fixed:not(.centered-links) #shortcuts {\n" + " :root.fixed:not(.centered-links) #shortcuts {\n" +
" float: initial;\n" + " float: initial;\n" +
" -webkit-flex: none;\n" +
" flex: none;\n" + " flex: none;\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
" -webkit-align-items: center;\n" + " -webkit-align-items: center;\n" +
" align-items: center;\n" + " align-items: center;\n" +
@ -18559,9 +18570,11 @@
" display: none;\n" + " display: none;\n" +
"}\n" + "}\n" +
"#embedding > div:first-child {\n" + "#embedding > div:first-child {\n" +
" display: -webkit-flex;\n" +
" display: flex;\n" + " display: flex;\n" +
"}\n" + "}\n" +
"#embedding .move {\n" + "#embedding .move {\n" +
" -webkit-flex: 1;\n" +
" flex: 1;\n" + " flex: 1;\n" +
"}\n" + "}\n" +
"#embedding .jump {\n" + "#embedding .jump {\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://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.2.6' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.2.7' />
</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.2.6' /> <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.2.7' />
</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.2.6", "version": "1.10.2.7",
"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/",

13
src/General/css/style.css
View File

@ -294,26 +294,33 @@ audio.controls-added {
@media (min-width: 1300px) { @media (min-width: 1300px) {
:root.fixed:not(.centered-links) #header-bar { :root.fixed:not(.centered-links) #header-bar {
white-space: nowrap; white-space: nowrap;
display: -webkit-flex;
display: flex; display: flex;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
} }
:root.fixed:not(.centered-links) #board-list { :root.fixed:not(.centered-links) #board-list {
-webkit-flex: auto;
flex: auto; flex: auto;
} }
:root.fixed:not(.centered-links) #full-board-list { :root.fixed:not(.centered-links) #full-board-list {
display: -webkit-flex;
display: flex; display: flex;
} }
:root.fixed:not(.centered-links) .hide-board-list-container { :root.fixed:not(.centered-links) .hide-board-list-container {
-webkit-flex: none;
flex: none; flex: none;
margin-right: 5px; margin-right: 5px;
} }
:root.fixed:not(.centered-links) #full-board-list > .boardList { :root.fixed:not(.centered-links) #full-board-list > .boardList {
-webkit-flex: auto;
flex: auto; flex: auto;
display: -webkit-flex;
display: flex; display: flex;
} }
:root.fixed:not(.centered-links) #full-board-list > .boardList > a, :root.fixed:not(.centered-links) #full-board-list > .boardList > a,
:root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) { :root.fixed:not(.centered-links) #full-board-list > .boardList > span:not(.space):not(.spacer) {
-webkit-flex: none;
flex: none; flex: none;
padding: .17em; padding: .17em;
margin: -.17em -.32em; margin: -.17em -.32em;
@ -322,14 +329,18 @@ audio.controls-added {
pointer-events: none; pointer-events: none;
} }
:root.fixed:not(.centered-links) #full-board-list > .boardList > span.space { :root.fixed:not(.centered-links) #full-board-list > .boardList > span.space {
-webkit-flex: 0 .63 .63em;
flex: 0 .63 .63em; flex: 0 .63 .63em;
} }
:root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer { :root.fixed:not(.centered-links) #full-board-list > .boardList > span.spacer {
-webkit-flex: 0 .38 .38em;
flex: 0 .38 .38em; flex: 0 .38 .38em;
} }
:root.fixed:not(.centered-links) #shortcuts { :root.fixed:not(.centered-links) #shortcuts {
float: initial; float: initial;
-webkit-flex: none;
flex: none; flex: none;
display: -webkit-flex;
display: flex; display: flex;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
@ -1555,9 +1566,11 @@ grunt.file.expand('src/General/img/links/*.png').map(function(file) {
display: none; display: none;
} }
#embedding > div:first-child { #embedding > div:first-child {
display: -webkit-flex;
display: flex; display: flex;
} }
#embedding .move { #embedding .move {
-webkit-flex: 1;
flex: 1; flex: 1;
} }
#embedding .jump { #embedding .jump {