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

Merge branch '1.9.4.x'

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 2014-09-30 22:49:27 -07:00
commit 27b023f717
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -15,6 +15,13 @@ The links to individual versions below are to copies of the script with the upda
- Fix bug in Firefox version causing lost data (e.g. watched threads, posts which are yours) when HTTP and HTTPS versions of 4chan are open at the same time. - Fix bug in Firefox version causing lost data (e.g. watched threads, posts which are yours) when HTTP and HTTPS versions of 4chan are open at the same time.
<!-- v1.9.4.x --> <!-- v1.9.4.x -->
### v1.9.4.2
*2014-09-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.2/builds/4chan-X-noupdate.crx "Chromium version")]
**ccd0**
- Support party hats in the JSON-built index.
- Fix party hats blocking the links behind them.
### v1.9.4.1 ### v1.9.4.1
*2014-09-23* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.1/builds/4chan-X-noupdate.crx "Chromium version")] *2014-09-23* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.4.1/builds/4chan-X-noupdate.crx "Chromium version")]

8
src/General/Index.coffee
View File

@ -94,7 +94,12 @@ Index =
$.on @selectSort, 'change', @cb.sort $.on @selectSort, 'change', @cb.sort
@update() @update()
$.asap (-> $('.board', doc) or d.readyState isnt 'loading'), -> $.asap (-> $('.board > .thread > .postContainer', doc) or d.readyState isnt 'loading'), ->
Index.hat = $ '.board > .thread > img:first-child'
if Index.hat and Index.nodes
for threadRoot in Index.nodes
$.prepend threadRoot, Index.hat.cloneNode false
board = $ '.board' board = $ '.board'
$.replace board, Index.root $.replace board, Index.root
$.event 'PostsInserted' $.event 'PostsInserted'
@ -443,6 +448,7 @@ Index =
for threadData, i in Index.liveThreadData for threadData, i in Index.liveThreadData
try try
threadRoot = Build.thread g.BOARD, threadData threadRoot = Build.thread g.BOARD, threadData
$.prepend threadRoot, Index.hat.cloneNode false if Index.hat
if thread = g.BOARD.threads[threadData.no] if thread = g.BOARD.threads[threadData.no]
thread.setCount 'post', threadData.replies + 1, threadData.bumplimit thread.setCount 'post', threadData.replies + 1, threadData.bumplimit
thread.setCount 'file', threadData.images + !!threadData.ext, threadData.imagelimit thread.setCount 'file', threadData.images + !!threadData.ext, threadData.imagelimit

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

@ -99,6 +99,10 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
unicode-bidi: -moz-isolate; unicode-bidi: -moz-isolate;
unicode-bidi: -webkit-isolate; unicode-bidi: -webkit-isolate;
} }
/* party hats */
.thread > img:first-child {
pointer-events: none;
}
/* fixed, z-index */ /* fixed, z-index */
#overlay, #overlay,