Permalink
Browse files

MDL-31643 dndupload - prevent file upload when total file count would…

… exceed the specified limit
  • Loading branch information...
1 parent 5bbf3cb commit 2561d6346c1696b377899551fe69367e1ac4fc25 @davosmith davosmith committed Feb 23, 2012
Showing with 6 additions and 5 deletions.
  1. +6 −5 lib/form/dndupload.js
View
@@ -294,21 +294,22 @@ M.form_dndupload.init = function(Y, options) {
this.pageentercount = 0;
this.hide_upload_ready();
this.hide_drop_target();
- this.show_progress_spinner();
var files = e._event.dataTransfer.files;
if (this.filemanager) {
var currentfilecount = this.filemanager.filecount;
+ if (((currentfilecount + files.length) > this.maxfiles) && (this.maxfiles != -1)) {
+ alert(M.util.get_string('maxfilesreached', 'moodle', this.maxfiles));
+ return false;
+ }
+ this.show_progress_spinner();
for (var i=0, f; f=files[i]; i++) {
- if (currentfilecount >= this.maxfiles && this.maxfiles != -1) {
- alert(M.util.get_string('maxfilesreached', 'moodle', this.maxfiles));
- break;
- }
if (this.upload_file(f)) {
currentfilecount++;
}
}
} else {
+ this.show_progress_spinner();
if (files.length >= 1) {
this.upload_file(files[0]);
}

0 comments on commit 2561d63

Please sign in to comment.