That's simpler.

This commit is contained in:
Nicolas Stepien 2013-02-26 19:11:52 +01:00
parent 1c71b4109d
commit 751fef81dd
2 changed files with 6 additions and 10 deletions

View File

@ -5720,9 +5720,7 @@
close: function() { close: function() {
var i, _i, _len, _ref; var i, _i, _len, _ref;
if (QR.req) { if (QR.req) {
if (!QR.req.isUploadFinished) { QR.abort();
QR.abort();
}
return; return;
} }
QR.nodes.el.hidden = true; QR.nodes.el.hidden = true;
@ -6523,9 +6521,7 @@
e.preventDefault(); e.preventDefault();
} }
if (QR.req) { if (QR.req) {
if (!QR.req.isUploadFinished) { QR.abort();
QR.abort();
}
return; return;
} }
if (QR.cooldown.seconds) { if (QR.cooldown.seconds) {
@ -6704,7 +6700,7 @@
return QR.status(); return QR.status();
}, },
abort: function() { abort: function() {
if (QR.req) { if (QR.req && !QR.req.isUploadFinished) {
QR.req.abort(); QR.req.abort();
delete QR.req; delete QR.req;
QR.notifications.push(new Notification('info', 'QR upload aborted.', 5)); QR.notifications.push(new Notification('info', 'QR upload aborted.', 5));

View File

@ -63,7 +63,7 @@ QR =
error: err error: err
close: -> close: ->
if QR.req if QR.req
QR.abort() unless QR.req.isUploadFinished QR.abort()
return return
QR.nodes.el.hidden = true QR.nodes.el.hidden = true
QR.cleanNotifications() QR.cleanNotifications()
@ -740,7 +740,7 @@ QR =
e?.preventDefault() e?.preventDefault()
if QR.req if QR.req
QR.abort() unless QR.req.isUploadFinished QR.abort()
return return
if QR.cooldown.seconds if QR.cooldown.seconds
@ -933,7 +933,7 @@ QR =
QR.status() QR.status()
abort: -> abort: ->
if QR.req if QR.req and !QR.req.isUploadFinished
QR.req.abort() QR.req.abort()
delete QR.req delete QR.req
QR.notifications.push new Notification 'info', 'QR upload aborted.', 5 QR.notifications.push new Notification 'info', 'QR upload aborted.', 5