arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed upload not showing correct error

Browse Source
This commit is contained in:
Tobias Reich 2016-03-24 22:37:37 +01:00
parent 472b54906a
commit a9ed9f08e7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/scripts/upload.js
View File

@ -93,15 +93,22 @@ upload.start = {
xhr.onload = function() { xhr.onload = function() {
let data = null
let wait = false let wait = false
let errorText = '' let errorText = ''
const isNumber = (n) => (!isNaN(parseFloat(n)) && isFinite(n)) const isNumber = (n) => (!isNaN(parseFloat(n)) && isFinite(n))
try {
data = JSON.parse(xhr.responseText)
} catch(e) {
data = ''
}
file.ready = true file.ready = true
// Set status // Set status
if (xhr.status===200 && isNumber(xhr.responseText)) { if (xhr.status===200 && isNumber(data)) {
// Success // Success
$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status') $('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
@ -110,9 +117,9 @@ upload.start = {
} else { } else {
if (xhr.responseText.substr(0, 6)==='Error:') { if (data.substr(0, 6)==='Error:') {
errorText = xhr.responseText.substr(6) + ' Please take a look at the console of your browser for further details.' errorText = data.substr(6) + ' Please take a look at the console of your browser for further details.'
error = true error = true
// Error Status // Error Status
@ -121,11 +128,11 @@ upload.start = {
.addClass('error') .addClass('error')
// Throw error // Throw error
if (error===true) lychee.error('Upload failed. Server returned an error!', xhr, xhr.responseText) if (error===true) lychee.error('Upload failed. Server returned an error!', xhr, data)
} else if (xhr.responseText.substr(0, 8)==='Warning:') { } else if (data.substr(0, 8)==='Warning:') {
errorText = xhr.responseText.substr(8) errorText = data.substr(8)
warning = true warning = true
// Warning Status // Warning Status
@ -134,7 +141,7 @@ upload.start = {
.addClass('warning') .addClass('warning')
// Throw error // Throw error
if (error===true) lychee.error('Upload failed. Server returned a warning!', xhr, xhr.responseText) if (error===true) lychee.error('Upload failed. Server returned a warning!', xhr, data)
} else { } else {
@ -147,7 +154,7 @@ upload.start = {
.addClass('error') .addClass('error')
// Throw error // Throw error
if (error===true) lychee.error('Upload failed. Server returned an unkown error!', xhr, xhr.responseText) if (error===true) lychee.error('Upload failed. Server returned an unkown error!', xhr, data)
} }