mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-31643_dndupload_reject_all_files' of git://github.com/davosmith/moodle
This commit is contained in:
commit
9b0e5e9d0d
@ -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]);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user