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

Browse Source
This commit is contained in:
Nicolas Stepien 2011-09-22 04:40:06 +02:00
commit 1496aec5e4
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
4chan_x.user.js
View File

@ -1258,7 +1258,7 @@
attach: function() { attach: function() {
var box, file, files; var box, file, files;
files = $('#files', QR.qr); files = $('#files', QR.qr);
box = $.el('span', { box = $.el('li', {
innerHTML: "<input type=file name=upfile accept='" + QR.accept + "'><img alt='click here'><a class=x>X</a>" innerHTML: "<input type=file name=upfile accept='" + QR.accept + "'><img alt='click here'><a class=x>X</a>"
}); });
file = $('input', box); file = $('input', box);
@ -1371,7 +1371,7 @@
text = ''; text = '';
} }
tid || (tid = g.THREAD_ID || ''); tid || (tid = g.THREAD_ID || '');
QR.qr = qr = ui.dialog('qr', 'top: 0; right: 0;', " <a class=close>X</a> <input type=checkbox id=autohide title=autohide> <div class=move> <span class=click> <button>File</button> <input form=qr_form placeholder=Name name=name> <input form=qr_form placeholder=Email name=email> <input form=qr_form placeholder=Subject name=sub> </span> </div> <div class=autohide> <textarea form=qr_form placeholder=Comment name=com></textarea> <div id=files></div> <form enctype=multipart/form-data method=post action=http://sys.4chan.org/" + g.BOARD + "/post target=iframe id=qr_form> <div hidden> <input name=pwd> <input name=mode value=regist> <input name=recaptcha_challenge_field id=challenge> <input name=recaptcha_response_field id=response> </div> <div id=captcha> <div><img></div> <span id=cl>120 Captchas</span> <input id=recaptcha_response_field autocomplete=off> </div> <div> <button>Submit</button> " + (g.REPLY ? "<label>[<input type=checkbox id=autopost title=autopost> Autopost]</label>" : '') + " <input form=qr_form placeholder=Thread name=resto value=" + tid + " " + (g.REPLY ? 'hidden' : '') + "> " + QR.spoiler + " </div> </form> </div> <a class=error></a> "); QR.qr = qr = ui.dialog('qr', 'top: 0; right: 0;', " <a class=close>X</a> <input type=checkbox id=autohide title=autohide> <div class=move> <span class=click> <button>File</button> <input form=qr_form placeholder=Name name=name> <input form=qr_form placeholder=Email name=email> <input form=qr_form placeholder=Subject name=sub> </span> </div> <div class=autohide> <textarea form=qr_form placeholder=Comment name=com></textarea> <ul id=files></ul> <form enctype=multipart/form-data method=post action=http://sys.4chan.org/" + g.BOARD + "/post target=iframe id=qr_form> <div hidden> <input name=pwd> <input name=mode value=regist> <input name=recaptcha_challenge_field id=challenge> <input name=recaptcha_response_field id=response> </div> <div id=captcha> <div><img></div> <span id=cl>120 Captchas</span> <input id=recaptcha_response_field autocomplete=off> </div> <div> <button>Submit</button> " + (g.REPLY ? "<label>[<input type=checkbox id=autopost title=autopost> Autopost]</label>" : '') + " <input form=qr_form placeholder=Thread name=resto value=" + tid + " " + (g.REPLY ? 'hidden' : '') + "> " + QR.spoiler + " </div> </form> </div> <a class=error></a> ");
c = d.cookie; c = d.cookie;
$('[name=name]', qr).value = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : ''; $('[name=name]', qr).value = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
$('[name=email]', qr).value = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : ''; $('[name=email]', qr).value = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
@ -3104,8 +3104,6 @@
display: block;\ display: block;\
}\ }\
#qr {\ #qr {\
max-height: 100%;\
overflow-y: auto;\
position: fixed;\ position: fixed;\
}\ }\
#qr #autohide, #qr .close {\ #qr #autohide, #qr .close {\
@ -3136,9 +3134,15 @@
width: 300px;\ width: 300px;\
white-space: nowrap;\ white-space: nowrap;\
overflow: auto;\ overflow: auto;\
margin: 0;\
padding: 0;\
}\ }\
#qr #files span {\ #qr #files li {\
position: relative;\ position: relative;\
display: inline-block;\
width: 100px;\
height: 100px;\
overflow: hidden;\
}\ }\
#qr #files a {\ #qr #files a {\
position: absolute;\ position: absolute;\
@ -3156,11 +3160,16 @@
width: 100%;\ width: 100%;\
}\ }\
#qr #files input {\ #qr #files input {\
display: none;\ /* cannot use `display: none;`\
https://bugs.webkit.org/show_bug.cgi?id=58208\
http://code.google.com/p/chromium/issues/detail?id=78961\
*/\
visibility: hidden;\
}\ }\
#qr #files img {\ #qr #files img {\
max-height: 100px;\ max-height: 100px;\
max-width: 100px;\ max-width: 100px;\
float: left;\
}\ }\
#qr input[name=resto] {\ #qr input[name=resto] {\
width: 80px;\ width: 80px;\

21
script.coffee
View File

@ -972,7 +972,7 @@ QR =
attach: -> attach: ->
#$('#autopost', QR.qr).checked = true #$('#autopost', QR.qr).checked = true
files = $ '#files', QR.qr files = $ '#files', QR.qr
box = $.el 'span', box = $.el 'li',
innerHTML: "<input type=file name=upfile accept='#{QR.accept}'><img alt='click here'><a class=x>X</a>" innerHTML: "<input type=file name=upfile accept='#{QR.accept}'><img alt='click here'><a class=x>X</a>"
file = $ 'input', box file = $ 'input', box
$.bind file, 'change', QR.change $.bind file, 'change', QR.change
@ -1060,7 +1060,7 @@ QR =
</div> </div>
<div class=autohide> <div class=autohide>
<textarea form=qr_form placeholder=Comment name=com></textarea> <textarea form=qr_form placeholder=Comment name=com></textarea>
<div id=files></div> <ul id=files></ul>
<form enctype=multipart/form-data method=post action=http://sys.4chan.org/#{g.BOARD}/post target=iframe id=qr_form> <form enctype=multipart/form-data method=post action=http://sys.4chan.org/#{g.BOARD}/post target=iframe id=qr_form>
<div hidden> <div hidden>
<input name=pwd> <input name=pwd>
@ -2434,8 +2434,6 @@ Main =
display: block; display: block;
} }
#qr { #qr {
max-height: 100%;
overflow-y: auto;
position: fixed; position: fixed;
} }
#qr #autohide, #qr .close { #qr #autohide, #qr .close {
@ -2466,9 +2464,15 @@ Main =
width: 300px; width: 300px;
white-space: nowrap; white-space: nowrap;
overflow: auto; overflow: auto;
margin: 0;
padding: 0;
} }
#qr #files span { #qr #files li {
position: relative; position: relative;
display: inline-block;
width: 100px;
height: 100px;
overflow: hidden;
} }
#qr #files a { #qr #files a {
position: absolute; position: absolute;
@ -2486,11 +2490,16 @@ Main =
width: 100%; width: 100%;
} }
#qr #files input { #qr #files input {
display: none; /* cannot use `display: none;`
https://bugs.webkit.org/show_bug.cgi?id=58208
http://code.google.com/p/chromium/issues/detail?id=78961
*/
visibility: hidden;
} }
#qr #files img { #qr #files img {
max-height: 100px; max-height: 100px;
max-width: 100px; max-width: 100px;
float: left;
} }
#qr input[name=resto] { #qr input[name=resto] {
width: 80px; width: 80px;