Merge branch 'master' of github.com:aeosynth/4chan-x into Fx10
This commit is contained in:
commit
8d8fd1c790
@ -1215,7 +1215,6 @@
|
||||
<div id=optionsbar>\
|
||||
<div id=credits>\
|
||||
<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://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>\
|
||||
</div>\
|
||||
@ -2129,7 +2128,7 @@
|
||||
var props, watched, _name;
|
||||
props = {
|
||||
href: "/" + g.BOARD + "/res/" + id,
|
||||
textContent: getTitle(thread).slice(0, 30)
|
||||
textContent: getTitle(thread)
|
||||
};
|
||||
watched = $.get('watched', {});
|
||||
watched[_name = g.BOARD] || (watched[_name] = {});
|
||||
@ -2714,7 +2713,9 @@
|
||||
redirect = function() {
|
||||
var url;
|
||||
switch (g.BOARD) {
|
||||
case 'diy':
|
||||
case 'g':
|
||||
case 'pol':
|
||||
case 'sci':
|
||||
url = "http://archive.installgentoo.net/cgi-board.pl/" + g.BOARD + "/thread/" + g.THREAD_ID;
|
||||
break;
|
||||
@ -3250,8 +3251,12 @@
|
||||
position: absolute;\
|
||||
}\
|
||||
#watcher > div {\
|
||||
overflow: hidden;\
|
||||
padding-right: 5px;\
|
||||
padding-left: 5px;\
|
||||
text-overflow: ellipsis;\
|
||||
max-width: 200px;\
|
||||
white-space: nowrap;\
|
||||
}\
|
||||
#watcher > div.move {\
|
||||
text-decoration: underline;\
|
||||
|
||||
@ -2,7 +2,7 @@ master
|
||||
- mayhem
|
||||
initiate 4chan X earlier
|
||||
automatically reload expanded pictures on error
|
||||
update /sci/ archive redirection
|
||||
update archives redirections for /diy/, /pol/ and /sci/
|
||||
regular expressions based filter
|
||||
handle bans with the thread updater
|
||||
performance improvements
|
||||
|
||||
@ -858,7 +858,6 @@ options =
|
||||
<div id=optionsbar>
|
||||
<div id=credits>
|
||||
<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://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2DBVZBUAM4DHC&lc=US&item_name=Aeosynth¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted>Donate</a>
|
||||
</div>
|
||||
@ -1626,7 +1625,7 @@ watcher =
|
||||
watch: (thread, id) ->
|
||||
props =
|
||||
href: "/#{g.BOARD}/res/#{id}"
|
||||
textContent: getTitle(thread)[...30]
|
||||
textContent: getTitle(thread)
|
||||
|
||||
watched = $.get 'watched', {}
|
||||
watched[g.BOARD] or= {}
|
||||
@ -2029,7 +2028,7 @@ Favicon =
|
||||
|
||||
redirect = ->
|
||||
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}"
|
||||
when 'lit', 'tv'
|
||||
url = "http://archive.gentoomen.org/cgi-board.pl/#{g.BOARD}/thread/#{g.THREAD_ID}"
|
||||
@ -2518,8 +2517,12 @@ Main =
|
||||
position: absolute;
|
||||
}
|
||||
#watcher > div {
|
||||
overflow: hidden;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
text-overflow: ellipsis;
|
||||
max-width: 200px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
#watcher > div.move {
|
||||
text-decoration: underline;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user