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

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

Browse Source
This commit is contained in:
Nicolas Stepien 2011-10-27 01:48:14 +02:00
commit 8d8fd1c790
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
4chan_x.user.js
View File

@ -1215,7 +1215,6 @@
<div id=optionsbar>\ <div id=optionsbar>\
<div id=credits>\ <div id=credits>\
<a href=http://aeosynth.github.com/4chan-x/>4chan X</a>\ <a href=http://aeosynth.github.com/4chan-x/>4chan X</a>\
| <a href=http://chat.now.im/x/aeos>Support Throd</a>\
| <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a>\ | <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a>\
| <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>\ | <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>\
</div>\ </div>\
@ -2129,7 +2128,7 @@
var props, watched, _name; var props, watched, _name;
props = { props = {
href: "/" + g.BOARD + "/res/" + id, href: "/" + g.BOARD + "/res/" + id,
textContent: getTitle(thread).slice(0, 30) textContent: getTitle(thread)
}; };
watched = $.get('watched', {}); watched = $.get('watched', {});
watched[_name = g.BOARD] || (watched[_name] = {}); watched[_name = g.BOARD] || (watched[_name] = {});
@ -2714,7 +2713,9 @@
redirect = function() { redirect = function() {
var url; var url;
switch (g.BOARD) { switch (g.BOARD) {
case 'diy':
case 'g': case 'g':
case 'pol':
case 'sci': case 'sci':
url = "http://archive.installgentoo.net/cgi-board.pl/" + g.BOARD + "/thread/" + g.THREAD_ID; url = "http://archive.installgentoo.net/cgi-board.pl/" + g.BOARD + "/thread/" + g.THREAD_ID;
break; break;
@ -3250,8 +3251,12 @@
position: absolute;\ position: absolute;\
}\ }\
#watcher > div {\ #watcher > div {\
overflow: hidden;\
padding-right: 5px;\ padding-right: 5px;\
padding-left: 5px;\ padding-left: 5px;\
text-overflow: ellipsis;\
max-width: 200px;\
white-space: nowrap;\
}\ }\
#watcher > div.move {\ #watcher > div.move {\
text-decoration: underline;\ text-decoration: underline;\

2
changelog
View File

@ -2,7 +2,7 @@ master
- mayhem - mayhem
initiate 4chan X earlier initiate 4chan X earlier
automatically reload expanded pictures on error automatically reload expanded pictures on error
update /sci/ archive redirection update archives redirections for /diy/, /pol/ and /sci/
regular expressions based filter regular expressions based filter
handle bans with the thread updater handle bans with the thread updater
performance improvements performance improvements

9
script.coffee
View File

@ -858,7 +858,6 @@ options =
<div id=optionsbar> <div id=optionsbar>
<div id=credits> <div id=credits>
<a href=http://aeosynth.github.com/4chan-x/>4chan X</a> <a href=http://aeosynth.github.com/4chan-x/>4chan X</a>
| <a href=http://chat.now.im/x/aeos>Support Throd</a>
| <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a> | <a href=https://github.com/aeosynth/4chan-x/issues>GitHub</a>
| <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a> | <a href=https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>
</div> </div>
@ -1626,7 +1625,7 @@ watcher =
watch: (thread, id) -> watch: (thread, id) ->
props = props =
href: "/#{g.BOARD}/res/#{id}" href: "/#{g.BOARD}/res/#{id}"
textContent: getTitle(thread)[...30] textContent: getTitle(thread)
watched = $.get 'watched', {} watched = $.get 'watched', {}
watched[g.BOARD] or= {} watched[g.BOARD] or= {}
@ -2029,7 +2028,7 @@ Favicon =
redirect = -> redirect = ->
switch g.BOARD switch g.BOARD
when 'g', 'sci' when 'diy', 'g', 'pol', 'sci'
url = "http://archive.installgentoo.net/cgi-board.pl/#{g.BOARD}/thread/#{g.THREAD_ID}" url = "http://archive.installgentoo.net/cgi-board.pl/#{g.BOARD}/thread/#{g.THREAD_ID}"
when 'lit', 'tv' when 'lit', 'tv'
url = "http://archive.gentoomen.org/cgi-board.pl/#{g.BOARD}/thread/#{g.THREAD_ID}" url = "http://archive.gentoomen.org/cgi-board.pl/#{g.BOARD}/thread/#{g.THREAD_ID}"
@ -2518,8 +2517,12 @@ Main =
position: absolute; position: absolute;
} }
#watcher > div { #watcher > div {
overflow: hidden;
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
text-overflow: ellipsis;
max-width: 200px;
white-space: nowrap;
} }
#watcher > div.move { #watcher > div.move {
text-decoration: underline; text-decoration: underline;