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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
No Face 2012-02-24 00:40:46 +01:00
commit ea51407c8c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
4chan_x.user.js
View File

@ -790,6 +790,7 @@
num = (function() {
switch (g.BOARD) {
case 'b':
case 'vg':
return 3;
case 't':
return 1;
@ -1523,7 +1524,7 @@
className: 'preview',
draggable: true,
href: 'javascript:;',
innerHTML: '<a class=remove>x</a><label hidden><input type=checkbox> Spoiler</label><span></span>'
innerHTML: '<a class=remove>&times;</a><label hidden><input type=checkbox> Spoiler</label><span></span>'
});
$('input', this.el).checked = this.spoiler;
$.on(this.el, 'click', function() {
@ -1717,7 +1718,7 @@
qr.el = ui.dialog('qr', 'top:0;right:0;', '\
<div class=move>\
Quick Reply <input type=checkbox id=autohide title=Auto-hide>\
<span> <a class=close title=Close>x</a></span>\
<span> <a class=close title=Close>&times;</a></span>\
</div>\
<form>\
<div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>\
@ -2114,7 +2115,8 @@
className: 'reply dialog',
innerHTML: '<div id=optionsbar>\
<div id=credits>\
<a target=_blank href=http://mayhemydg.github.com/4chan-x/>4chan X</a> | ' + VERSION + '\
<a target=_blank href=http://mayhemydg.github.com/4chan-x/>4chan X</a>\
| <a target=_blank href=https://raw.github.com/mayhemydg/4chan-x/master/changelog>' + VERSION + '</a>\
| <a target=_blank href=http://mayhemydg.github.com/4chan-x/#bug-report>Issues</a>\
</div>\
<div>\
@ -2643,7 +2645,7 @@
for (id in _ref) {
props = _ref[id];
x = $.el('a', {
textContent: 'X',
textContent: '\u00d7',
href: 'javascript:;'
});
$.on(x, 'click', watcher.cb.x);
@ -3339,6 +3341,7 @@
case 'm':
case 'tg':
case 'u':
case 'vg':
return "http://archive.foolz.us/" + href[3] + "/full_image/" + href[5];
}
},
@ -4006,13 +4009,13 @@ img[md5], img[md5] + img {\
/* revealed spoilers do not have height/width,\
this fixed "expanded" auto-gifs */\
img[md5] {\
max-height: 126px;\
max-width: 126px;\
}\
.op > a > img[md5] {\
max-height: 251px;\
max-width: 251px;\
}\
td > .filesize > img[md5] {\
max-height: 126px;\
max-width: 126px;\
}\
\
#qr, #qp, #updater, #stats, #ihover, #overlay, #navlinks {\
position: fixed;\

22
script.coffee
View File

@ -661,7 +661,7 @@ expandThread =
a.textContent = a.textContent.replace '-', '+'
#goddamit moot
num = switch g.BOARD
when 'b' then 3
when 'b', 'vg' then 3
when 't' then 1
else 5
table = $.x "following::br[@clear]/preceding::table[#{num}]", a
@ -1227,7 +1227,7 @@ qr =
className: 'preview'
draggable: true
href: 'javascript:;'
innerHTML: '<a class=remove>x</a><label hidden><input type=checkbox> Spoiler</label><span></span>'
innerHTML: '<a class=remove>&times;</a><label hidden><input type=checkbox> Spoiler</label><span></span>'
$('input', @el).checked = @spoiler
$.on @el, 'click', => @select()
$.on $('.remove', @el), 'click', (e) =>
@ -1364,7 +1364,7 @@ qr =
qr.el = ui.dialog 'qr', 'top:0;right:0;', '
<div class=move>
Quick Reply <input type=checkbox id=autohide title=Auto-hide>
<span> <a class=close title=Close>x</a></span>
<span> <a class=close title=Close>&times;</a></span>
</div>
<form>
<div><input id=dump class=field type=button title="Dump list" value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>
@ -1712,7 +1712,8 @@ options =
className: 'reply dialog'
innerHTML: '<div id=optionsbar>
<div id=credits>
<a target=_blank href=http://mayhemydg.github.com/4chan-x/>4chan X</a> | ' + VERSION + '
<a target=_blank href=http://mayhemydg.github.com/4chan-x/>4chan X</a>
| <a target=_blank href=https://raw.github.com/mayhemydg/4chan-x/master/changelog>' + VERSION + '</a>
| <a target=_blank href=http://mayhemydg.github.com/4chan-x/#bug-report>Issues</a>
</div>
<div>
@ -2180,7 +2181,8 @@ watcher =
for board of watched
for id, props of watched[board]
x = $.el 'a',
textContent: 'X'
# \u00d7 is &times;
textContent: '\u00d7'
href: 'javascript:;'
$.on x, 'click', watcher.cb.x
link = $.el 'a', props
@ -2726,7 +2728,7 @@ redirect =
# Do not use g.BOARD, the image url can originate from a cross-quote.
return unless conf['404 Redirect']
switch href[3]
when 'a', 'jp', 'm', 'tg', 'u'
when 'a', 'jp', 'm', 'tg', 'u', 'vg'
"http://archive.foolz.us/#{href[3]}/full_image/#{href[5]}"
thread: ->
return unless conf['404 Redirect']
@ -3337,13 +3339,13 @@ img[md5], img[md5] + img {
/* revealed spoilers do not have height/width,
this fixed "expanded" auto-gifs */
img[md5] {
max-height: 126px;
max-width: 126px;
}
.op > a > img[md5] {
max-height: 251px;
max-width: 251px;
}
td > .filesize > img[md5] {
max-height: 126px;
max-width: 126px;
}
#qr, #qp, #updater, #stats, #ihover, #overlay, #navlinks {
position: fixed;