L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-51117-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-02-16 13:27:04 +08:00
parent a4112f7906 e271dc1e96
commit 0682e95c72
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/dndupload.js
+7 -5
View File
@@ -743,7 +743,9 @@ M.course_dndupload = {
var self = this;
if (file.size > this.maxbytes) {
alert("'"+file.name+"' "+M.util.get_string('filetoolarge', 'moodle'));
new M.core.alert({
message: "'" + file.name + "' " + M.util.get_string('filetoolarge', 'moodle')
});
return;
}
@@ -777,11 +779,11 @@ M.course_dndupload = {
} else {
// Error - remove the dummy element
resel.parent.removeChild(resel.li);
alert(result.error);
new M.core.alert({message: result.error});
}
}
} else {
alert(M.util.get_string('servererror', 'moodle'));
new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
}
}
};
@@ -1002,11 +1004,11 @@ M.course_dndupload = {
} else {
// Error - remove the dummy element
resel.parent.removeChild(resel.li);
alert(result.error);
new M.core.alert({message: result.error});
}
}
} else {
alert(M.util.get_string('servererror', 'moodle'));
new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
}
}
};