clean up cross-origin request code

src/General/CrossOrigin.coffee

@@ -1,6 +1,6 @@
 CrossOrigin = do ->
 
-  handleBlob = (urlBlob, contentType, contentDisposition, url, cb) ->
+  makeBlob = (urlBlob, contentType, contentDisposition, url) ->
     name = url.match(/([^\/]+)\/*$/)?[1]
     mime = contentType?.match(/[^;]*/)[0] or 'application/octet-stream'
     match =
@@ -10,25 +10,20 @@ CrossOrigin = do ->
       name = match.replace /\\"/g, '"'
     blob = new Blob([urlBlob], {type: mime})
     blob.name = name
-    cb blob
+    blob
 
-  handleUrl = (url, cb) ->
+  file = (url, cb) ->
     <% if (type === 'crx') { %>
-    xhr = new XMLHttpRequest();
+    $.ajax url,
-    xhr.open('GET', url, true)
+      responseType: 'blob'
-    xhr.responseType = 'blob'
+      onload: ->
-    xhr.onload = (e) ->
+        return cb null unless @readyState is @DONE and @status is 200
-      if @readyState is @DONE && xhr.status is 200
+        contentType        = @getResponseHeader 'Content-Type'
-        contentType = @getResponseHeader('Content-Type')
+        contentDisposition = @getResponseHeader 'Content-Disposition'
-        contentDisposition = @getResponseHeader('Content-Disposition')
+        cb (makeBlob @response, contentType, contentDisposition, url)
-        handleBlob @response, contentType, contentDisposition, url, cb
+      onerror: ->
-      else
         cb null
-    xhr.onerror = (e) ->
-      cb null
-    xhr.send()
     <% } %>
-
     <% if (type === 'userscript') { %>
     GM_xmlhttpRequest
       method: "GET"
@@ -36,17 +31,16 @@ CrossOrigin = do ->
       overrideMimeType: "text/plain; charset=x-user-defined"
       onload: (xhr) ->
         r = xhr.responseText
-        data = new Uint8Array(r.length)
+        data = new Uint8Array r.length
         i = 0
         while i < r.length
-          data[i] = r.charCodeAt(i)
+          data[i] = r.charCodeAt i
           i++
-        contentType = xhr.responseHeaders.match(/Content-Type:\s*(.*)/i)?[1]
+        contentType        = xhr.responseHeaders.match(/Content-Type:\s*(.*)/i)?[1]
         contentDisposition = xhr.responseHeaders.match(/Content-Disposition:\s*(.*)/i)?[1]
-        handleBlob data, contentType, contentDisposition, url, cb
+        cb (makeBlob data, contentType, contentDisposition, url)
-      onerror: (xhr) ->
+      onerror: ->
         cb null
     <% } %>
 
-  return {request: handleUrl}
+  {file}
-

src/Menu/DownloadLink.coffee

@@ -10,7 +10,7 @@ DownloadLink =
     $.on a, 'click', (e) ->
       return true if @protocol is 'blob:'
       e.preventDefault()
-      CrossOrigin.request @href, (blob) =>
+      CrossOrigin.file @href, (blob) =>
         if blob
           @href = URL.createObjectURL blob
           @click()

src/Posting/QR.coffee

@@ -290,7 +290,7 @@ QR =
   handleUrl:  ->
     url = prompt("Insert an url:")
     return if url is null
-    CrossOrigin.request url, (blob) ->
+    CrossOrigin.file url, (blob) ->
       if blob
         QR.handleFiles([blob])
       else