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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
James Campos 2011-04-06 04:28:13 -07:00
commit 4b8725297b
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
4chan_x.js
View File

@ -2,7 +2,7 @@
// @name 4chan x // @name 4chan x
// @namespace aeosynth // @namespace aeosynth
// @description Adds various features. // @description Adds various features.
// @version 1.27.3 // @version 1.27.6
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com> // @copyright 2009-2011 James Campos <james.r.campos@gmail.com>
// @license MIT; http://en.wikipedia.org/wiki/Mit_license // @license MIT; http://en.wikipedia.org/wiki/Mit_license
// @include http://boards.4chan.org/* // @include http://boards.4chan.org/*
@ -560,7 +560,6 @@
imgHeight = img.offsetHeight; imgHeight = img.offsetHeight;
top = clientY + imageHover.offset.y; top = clientY + imageHover.offset.y;
bot = top + imgHeight; bot = top + imgHeight;
log(bot, imageHover.winHeight);
img.style.top = imageHover.winHeight < imgHeight || top < 0 ? '0px' : bot > imageHover.winHeight ? imageHover.winHeight - imgHeight + 'px' : top + 'px'; img.style.top = imageHover.winHeight < imgHeight || top < 0 ? '0px' : bot > imageHover.winHeight ? imageHover.winHeight - imgHeight + 'px' : top + 'px';
return img.style.left = clientX + imageHover.offset.x; return img.style.left = clientX + imageHover.offset.x;
}, },
@ -978,16 +977,16 @@
}, },
load: function(e) { load: function(e) {
var dialog; var dialog;
recaptchaReload();
try { try {
return e.target.contentWindow.postMessage('', '*'); return e.target.contentWindow.postMessage('', '*');
} catch (err) { } catch (err) {
dialog = $('#qr'); dialog = $('#qr');
if (g.REPLY && $.config('Persistent QR')) { if (g.REPLY && $.config('Persistent QR')) {
qr.refresh(dialog); return qr.refresh(dialog);
} else { } else {
$.remove(dialog); return $.remove(dialog);
} }
return recaptchaReload();
} }
}, },
messageIframe: function(e) { messageIframe: function(e) {
@ -1542,7 +1541,7 @@
interval = $('input[name=interval]', div); interval = $('input[name=interval]', div);
interval.value = GM_getValue('Interval', 10); interval.value = GM_getValue('Interval', 10);
$.bind(interval, 'change', updateInterval); $.bind(interval, 'change', updateInterval);
$.bind($('input[type=button]'), 'click', updateNow); $.bind($('input[type=button]', div), 'click', updateNow);
d.body.appendChild(div); d.body.appendChild(div);
if (GM_getValue('autoG')) { if (GM_getValue('autoG')) {
return updateAuto.call($("input[name=autoL]", div)); return updateAuto.call($("input[name=autoL]", div));

9
changelog
View File

@ -1,3 +1,12 @@
1.27.6
- fix 'update now' button
1.27.5
- fix regression - reload captcha after posting
1.27.4
- fix imageHover on chrome
1.27.3 1.27.3
- fix regression - movement - fix regression - movement

2
header
View File

@ -2,7 +2,7 @@
// @name 4chan x // @name 4chan x
// @namespace aeosynth // @namespace aeosynth
// @description Adds various features. // @description Adds various features.
// @version 1.27.3 // @version 1.27.6
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com> // @copyright 2009-2011 James Campos <james.r.campos@gmail.com>
// @license MIT; http://en.wikipedia.org/wiki/Mit_license // @license MIT; http://en.wikipedia.org/wiki/Mit_license
// @include http://boards.4chan.org/* // @include http://boards.4chan.org/*

7
script.coffee
View File

@ -1,3 +1,4 @@
# XXX error on FUCKING CHROME
{log} = console if console? {log} = console if console?
config = config =
@ -390,7 +391,6 @@ imageHover =
top = clientY + imageHover.offset.y top = clientY + imageHover.offset.y
bot = top + imgHeight bot = top + imgHeight
log bot, imageHover.winHeight
img.style.top = img.style.top =
if imageHover.winHeight < imgHeight or top < 0 if imageHover.winHeight < imgHeight or top < 0
'0px' '0px'
@ -722,6 +722,7 @@ qr =
$.removeClass dialog, 'auto' $.removeClass dialog, 'auto'
load: (e) -> load: (e) ->
recaptchaReload()
try try
e.target.contentWindow.postMessage '', '*' e.target.contentWindow.postMessage '', '*'
catch err catch err
@ -732,8 +733,6 @@ qr =
else else
$.remove dialog $.remove dialog
recaptchaReload()
messageIframe: (e) -> messageIframe: (e) ->
message = $('table b').firstChild.textContent message = $('table b').firstChild.textContent
e.source.postMessage message, '*' e.source.postMessage message, '*'
@ -1182,7 +1181,7 @@ updaterMake = ->
interval.value = GM_getValue 'Interval', 10 interval.value = GM_getValue 'Interval', 10
$.bind interval, 'change', updateInterval $.bind interval, 'change', updateInterval
$.bind $('input[type=button]'), 'click', updateNow $.bind $('input[type=button]', div), 'click', updateNow
d.body.appendChild div d.body.appendChild div