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

This commit is contained in:
Nicolas Stepien 2012-12-14 18:13:33 +01:00
commit 2f0427ad94
3 changed files with 4 additions and 2 deletions

View File

@ -1204,7 +1204,7 @@
}); });
a = stub.firstChild; a = stub.firstChild;
$.on(a, 'click', ReplyHiding.toggle); $.on(a, 'click', ReplyHiding.toggle);
$.add(a, $.tn($('.desktop > .nameBlock', el).textContent)); $.add(a, $.tn(Conf['Anonymize'] ? 'Anonymous' : $('.desktop > .nameBlock', el).textContent));
if (Conf['Menu']) { if (Conf['Menu']) {
menuButton = Menu.a.cloneNode(true); menuButton = Menu.a.cloneNode(true);
$.on(menuButton, 'click', Menu.toggle); $.on(menuButton, 'click', Menu.toggle);

View File

@ -1,4 +1,6 @@
master master
- noface
Fix Anonymize not working on stubs.
- Mayhem - Mayhem
Fix selection quoting on Opera. Fix selection quoting on Opera.
Fix history bug with Persistent QR enabled on Chrome. Fix history bug with Persistent QR enabled on Chrome.

View File

@ -954,7 +954,7 @@ ReplyHiding =
innerHTML: '<a href="javascript:;"><span>[ + ]</span> </a>' innerHTML: '<a href="javascript:;"><span>[ + ]</span> </a>'
a = stub.firstChild a = stub.firstChild
$.on a, 'click', ReplyHiding.toggle $.on a, 'click', ReplyHiding.toggle
$.add a, $.tn $('.desktop > .nameBlock', el).textContent $.add a, $.tn if Conf['Anonymize'] then 'Anonymous' else $('.desktop > .nameBlock', el).textContent
if Conf['Menu'] if Conf['Menu']
menuButton = Menu.a.cloneNode true menuButton = Menu.a.cloneNode true
$.on menuButton, 'click', Menu.toggle $.on menuButton, 'click', Menu.toggle