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

Merge branch 'mayhem' into v3

Browse Source 
Conflicts:
	CHANGELOG.md
	package.json
This commit is contained in:
Zixaphir 2014-04-20 07:14:29 -07:00
commit 871d7820b7
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.7.8 - 2014-04-19 * 4chan X - Version 1.7.8 - 2014-04-20
* *
* 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

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

@ -24,7 +24,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.7.8 - 2014-04-19 * 4chan X - Version 1.7.8 - 2014-04-20
* *
* 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
@ -3765,6 +3765,9 @@
if (href[0] === '/') { if (href[0] === '/') {
continue; continue;
} }
if (href[0] === '#') {
href = "" + threadID + href;
}
quote.href = "/" + boardID + "/thread/" + href; quote.href = "/" + boardID + "/thread/" + href;
} }
return container; return container;

5
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* 4chan X - Version 1.7.8 - 2014-04-19 * 4chan X - Version 1.7.8 - 2014-04-20
* *
* 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
@ -3824,6 +3824,9 @@
if (href[0] === '/') { if (href[0] === '/') {
continue; continue;
} }
if (href[0] === '#') {
href = "" + threadID + href;
}
quote.href = "/" + boardID + "/thread/" + href; quote.href = "/" + boardID + "/thread/" + href;
} }
return container; return container;

2
css/style.css
View File

@ -105,7 +105,7 @@ a[href="javascript:;"] {
:root.bottom-header body { :root.bottom-header body {
margin-bottom: 2em; margin-bottom: 2em;
} }
body > .desktop, body > .desktop:not(#boardNavDesktop):not(#boardNavDesktopFoot),
:root.fourchan-x #navtopright, :root.fourchan-x #navtopright,
:root.fourchan-x #navbotright, :root.fourchan-x #navbotright,
:root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop, :root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop,

1
src/General/Build.coffee
View File

@ -228,6 +228,7 @@ Build =
for quote in $$ '.quotelink', container for quote in $$ '.quotelink', container
href = quote.getAttribute 'href' href = quote.getAttribute 'href'
continue if href[0] is '/' # Cross-board quote, or board link continue if href[0] is '/' # Cross-board quote, or board link
href = "#{threadID}#{href}" if href[0] is '#'
quote.href = "/#{boardID}/thread/#{href}" # Fix pathnames quote.href = "/#{boardID}/thread/#{href}" # Fix pathnames
container container