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

Only need progress event for upload monitoring.

Browse Source
This commit is contained in:
ccd0 2019-03-23 21:59:30 -07:00
parent 4af0e0b962
commit 5bd4a2859e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Posting/QR.coffee
View File

@ -722,16 +722,15 @@ QR =
extra = extra =
form: $.formData formData form: $.formData formData
if Conf['Show Upload Progress'] if Conf['Show Upload Progress']
extra.upCallbacks = extra.onprogress = (e) ->
onload: -> if e.loaded < e.total
# Uploading...
QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
else
# Upload done, waiting for server response. # Upload done, waiting for server response.
QR.req.isUploadFinished = true QR.req.isUploadFinished = true
QR.req.progress = '...' QR.req.progress = '...'
QR.status() QR.status()
onprogress: (e) ->
# Uploading...
QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
QR.status()
cb = (response) -> cb = (response) ->
if response? if response?

4
src/platform/$.coffee
View File

@ -47,7 +47,7 @@ $.ajax = do ->
pageXHR = XMLHttpRequest pageXHR = XMLHttpRequest
(url, options={}, extra={}) -> (url, options={}, extra={}) ->
{type, upCallbacks, form, headers} = extra {type, onprogress, form, headers} = extra
options.responseType ?= 'json' options.responseType ?= 'json'
# XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310 # XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310
url = url.replace /^((?:https?:)?\/\/(?:\w+\.)?4c(?:ha|d)n\.org)\/adv\//, '$1//adv/' url = url.replace /^((?:https?:)?\/\/(?:\w+\.)?4c(?:ha|d)n\.org)\/adv\//, '$1//adv/'
@ -58,7 +58,7 @@ $.ajax = do ->
for key, value of (headers or {}) for key, value of (headers or {})
r.setRequestHeader key, value r.setRequestHeader key, value
$.extend r, options $.extend r, options
$.extend r.upload, upCallbacks $.extend r.upload, {onprogress}
# connection error or content blocker # connection error or content blocker
$.on r, 'error', -> (c.warn "4chan X failed to load: #{url}" unless r.status) $.on r, 'error', -> (c.warn "4chan X failed to load: #{url}" unless r.status)
<% if (type === 'crx') { %> <% if (type === 'crx') { %>