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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
This commit is contained in:
Zixaphir 2013-05-10 23:00:10 -07:00
commit 56518cadd2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/appchan-x.js
View File

@ -12905,7 +12905,7 @@
getThread: function(full) {
var headRect, i, rect, thread, threads, topMargin, _i, _len;
if (Conf['Bottom header']) {
if (Conf['Bottom header'] || !Conf['Fixed Header']) {
topMargin = 0;
} else {
headRect = Header.bar.getBoundingClientRect();

2
builds/appchan-x.user.js
View File

@ -12914,7 +12914,7 @@
getThread: function(full) {
var headRect, i, rect, thread, threads, topMargin, _i, _len;
if (Conf['Bottom header']) {
if (Conf['Bottom header'] || !Conf['Fixed Header']) {
topMargin = 0;
} else {
headRect = Header.bar.getBoundingClientRect();

2
builds/crx/script.js
View File

@ -12896,7 +12896,7 @@
getThread: function(full) {
var headRect, i, rect, thread, threads, topMargin, _i, _len;
if (Conf['Bottom header']) {
if (Conf['Bottom header'] || !Conf['Fixed Header']) {
topMargin = 0;
} else {
headRect = Header.bar.getBoundingClientRect();

2
src/Miscellaneous/Nav.coffee
View File

@ -37,7 +37,7 @@ Nav =
Nav.scroll +1
getThread: (full) ->
if Conf['Bottom header']
if Conf['Bottom header'] or !Conf['Fixed Header']
topMargin = 0
else
headRect = Header.bar.getBoundingClientRect()