aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-01-29 07:48:50 -0800
committerMorris Jobke <morris.jobke@gmail.com>2014-01-29 07:48:50 -0800
commitafa00318bcabf53bed4f33633dae55c9efa43dd7 (patch)
treed3a51668032d86f310288bd7f3280d13f3f63380 /apps/files/js
parentf5f918b8bf5279fd174fe520c21f83c902904843 (diff)
parent58c7042e708172b8e2fe252fc53abe87bcf8c1f1 (diff)
downloadnextcloud-server-afa00318bcabf53bed4f33633dae55c9efa43dd7.tar.gz
nextcloud-server-afa00318bcabf53bed4f33633dae55c9efa43dd7.zip
Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
Added error message for when target folder was removed
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/file-upload.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 225c3319107..486273a910c 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -315,6 +315,13 @@ $(document).ready(function() {
} else {
// HTTP connection problem
OC.Notification.show(data.errorThrown);
+ if (data.result) {
+ var result = JSON.parse(data.result);
+ if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
+ // abort upload of next files if any
+ OC.Upload.cancelUploads();
+ }
+ }
}
//hide notification after 10 sec
setTimeout(function() {