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

Give the status and status code on QR reponse if it isn't 200.

Browse Source
This commit is contained in:
Nicolas Stepien 2013-02-23 16:19:05 +01:00
parent e8c54cc6e0
commit 22c341e46d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
4chan_x.user.js
View File

@ -6417,7 +6417,7 @@
}; };
callbacks = { callbacks = {
onload: function() { onload: function() {
return QR.response(this.response); return QR.response(this);
}, },
onerror: function() { onerror: function() {
delete QR.ajax; delete QR.ajax;
@ -6447,11 +6447,11 @@
}; };
return QR.ajax = $.ajax($.id('postForm').parentNode.action, callbacks, opts); return QR.ajax = $.ajax($.id('postForm').parentNode.action, callbacks, opts);
}, },
response: function(html) { response: function(req) {
var ban, board, err, h1, persona, postID, reply, threadID, tmpDoc, _, _ref, _ref1; var ban, board, err, h1, persona, postID, reply, threadID, tmpDoc, _, _ref, _ref1;
delete QR.ajax; delete QR.ajax;
tmpDoc = d.implementation.createHTMLDocument(''); tmpDoc = d.implementation.createHTMLDocument('');
tmpDoc.documentElement.innerHTML = html; tmpDoc.documentElement.innerHTML = req.response;
if (ban = $('.banType', tmpDoc)) { if (ban = $('.banType', tmpDoc)) {
board = $('.board', tmpDoc).innerHTML; board = $('.board', tmpDoc).innerHTML;
err = $.el('span', { err = $.el('span', {
@ -6463,6 +6463,8 @@
} }
} else if (tmpDoc.title !== 'Post successful!') { } else if (tmpDoc.title !== 'Post successful!') {
err = 'Connection error with sys.4chan.org.'; err = 'Connection error with sys.4chan.org.';
} else if (req.status !== 200) {
err = "Error " + req.statusText + " (" + req.status + ")";
} }
if (err) { if (err) {
if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') { if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') {

8
src/qr.coffee
View File

@ -720,7 +720,7 @@ QR =
callbacks = callbacks =
onload: -> onload: ->
QR.response @response QR.response @
onerror: -> onerror: ->
delete QR.ajax delete QR.ajax
# Connection error, or # Connection error, or
@ -743,11 +743,11 @@ QR =
QR.ajax = $.ajax $.id('postForm').parentNode.action, callbacks, opts QR.ajax = $.ajax $.id('postForm').parentNode.action, callbacks, opts
response: (html) -> response: (req) ->
delete QR.ajax delete QR.ajax
tmpDoc = d.implementation.createHTMLDocument '' tmpDoc = d.implementation.createHTMLDocument ''
tmpDoc.documentElement.innerHTML = html tmpDoc.documentElement.innerHTML = req.response
if ban = $ '.banType', tmpDoc # banned/warning if ban = $ '.banType', tmpDoc # banned/warning
board = $('.board', tmpDoc).innerHTML board = $('.board', tmpDoc).innerHTML
err = $.el 'span', innerHTML: err = $.el 'span', innerHTML:
@ -761,6 +761,8 @@ QR =
$('a', err)?.target = '_blank' # duplicate image link $('a', err)?.target = '_blank' # duplicate image link
else if tmpDoc.title isnt 'Post successful!' else if tmpDoc.title isnt 'Post successful!'
err = 'Connection error with sys.4chan.org.' err = 'Connection error with sys.4chan.org.'
else if req.status isnt 200
err = "Error #{req.statusText} (#{req.status})"
if err if err
if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.' if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.'