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

Merge branch 'bstable'

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2015-02-09 08:25:18 -08:00
commit ae621e96ef
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -16,6 +16,11 @@ The links to individual versions below are to copies of the script with the upda
- (Zixaphir, ccd0) Various other minor changes and bugfixes.
<!-- v1.9.23.x -->
### v1.9.23.9
*2015-02-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.9/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix top catalog link replacement with JSON Navigation off, External Catalog on.
### v1.9.23.8
*2015-02-08* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.8/builds/4chan-X-noupdate.crx "Chromium version")]

4
src/Miscellaneous/CatalogLinks.coffee
View File

@ -3,8 +3,8 @@ CatalogLinks =
if (Conf['External Catalog'] or Conf['JSON Navigation']) and !(Conf['JSON Navigation'] and g.VIEW is 'index')
selector = switch g.VIEW
when 'thread', 'archive' then '.navLinks.desktop > a'
when 'catalog' then '.navLinks > :first-child > a'
when 'index' then '.middlead + .desktop > a, .cataloglink > a'
when 'catalog' then '.navLinks > :first-child > a'
when 'index' then '#ctrl-top > a, .cataloglink > a'
$.ready ->
for link in $$ selector
switch link.pathname