Merge branch 'master' of github.com:aeosynth/4chan-x

This commit is contained in:
Nicolas Stepien 2011-08-01 06:04:04 +02:00
commit c9c24fbdbe
2 changed files with 4 additions and 4 deletions

View File

@ -2730,10 +2730,10 @@
Recaptcha.init();
$.bind(form, 'submit', qr.submit);
}
threading.init();
if ((id = location.hash.slice(1)) && !$.id(id)) {
scrollTo(0, d.body.scrollHeight);
}
threading.init();
if (conf['Auto Noko']) {
$('.postarea form').action += '?noko';
}

View File

@ -2112,14 +2112,14 @@ main =
Recaptcha.init()
$.bind form, 'submit', qr.submit
#major features
threading.init()
# scroll to bottom if post isn't found
# thumbnail generation takes time
if (id = location.hash[1..]) and !$.id id
scrollTo 0, d.body.scrollHeight
#major features
threading.init()
if conf['Auto Noko']
$('.postarea form').action += '?noko'