From 5bd4a2859eb5d900d2de28ac2e1e6d1924f55c7e Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 23 Mar 2019 21:59:30 -0700
Subject: [PATCH] Only need progress event for upload monitoring.

---
 src/Posting/QR.coffee | 13 ++++++-------
 src/platform/$.coffee |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 4412dd876..f0784fe21 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -722,16 +722,15 @@ QR =
     extra =
       form: $.formData formData
     if Conf['Show Upload Progress']
-      extra.upCallbacks =
-        onload: ->
+      extra.onprogress = (e) ->
+        if e.loaded < e.total
+          # Uploading...
+          QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
+        else
           # Upload done, waiting for server response.
           QR.req.isUploadFinished = true
           QR.req.progress = '...'
-          QR.status()
-        onprogress: (e) ->
-          # Uploading...
-          QR.req.progress = "#{Math.round e.loaded / e.total * 100}%"
-          QR.status()
+        QR.status()
 
     cb = (response) ->
       if response?
diff --git a/src/platform/$.coffee b/src/platform/$.coffee
index 257942d07..34304f7a1 100644
--- a/src/platform/$.coffee
+++ b/src/platform/$.coffee
@@ -47,7 +47,7 @@ $.ajax = do ->
     pageXHR = XMLHttpRequest
 
   (url, options={}, extra={}) ->
-    {type, upCallbacks, form, headers} = extra
+    {type, onprogress, form, headers} = extra
     options.responseType ?= 'json'
     # 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/'
@@ -58,7 +58,7 @@ $.ajax = do ->
       for key, value of (headers or {})
         r.setRequestHeader key, value
       $.extend r, options
-      $.extend r.upload, upCallbacks
+      $.extend r.upload, {onprogress}
       # connection error or content blocker
       $.on r, 'error', -> (c.warn "4chan X failed to load: #{url}" unless r.status)
       <% if (type === 'crx') { %>