taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

An small refactor

stable
David Barragán Merino 2015-07-01 16:12:34 +02:00
parent 8bc585ccb6
commit e2b527bf11
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/coffee/modules/resources/attachments.coffee
View File

@ -48,8 +48,6 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
defered.reject(response) defered.reject(response)
return defered.promise return defered.promise
xhr = new XMLHttpRequest()
uploadProgress = (evt) => uploadProgress = (evt) =>
$rootScope.$apply => $rootScope.$apply =>
file.status = "in-progress" file.status = "in-progress"
@ -60,18 +58,20 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
uploadComplete = (evt) => uploadComplete = (evt) =>
$rootScope.$apply -> $rootScope.$apply ->
file.status = "done" file.status = "done"
status = evt.target.status
try try
data = JSON.parse(evt.target.responseText) data = JSON.parse(evt.target.responseText)
catch catch
data = {} data = {}
if status >= 200 and status < 400
model = $model.make_model(urlName, data) model = $model.make_model(urlName, data)
if xhr.status >= 200 and xhr.status < 400
defered.resolve(model) defered.resolve(model)
else else
response = { response = {
status: xhr.status, status: status,
data: {_error_message: JSON.parse(xhr.response)['attached_file']?[0]} data: {_error_message: data['attached_file']?[0]}
} }
defered.reject(response) defered.reject(response)
@ -85,6 +85,7 @@ resourceProvider = ($rootScope, $config, $urls, $model, $repo, $auth, $q) ->
data.append("object_id", objectId) data.append("object_id", objectId)
data.append("attached_file", file) data.append("attached_file", file)
xhr = new XMLHttpRequest()
xhr.upload.addEventListener("progress", uploadProgress, false) xhr.upload.addEventListener("progress", uploadProgress, false)
xhr.addEventListener("load", uploadComplete, false) xhr.addEventListener("load", uploadComplete, false)
xhr.addEventListener("error", uploadFailed, false) xhr.addEventListener("error", uploadFailed, false)