0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated edit extension, better error message

Browse source
This commit is contained in:
markseu 2020-03-10 13:58:41 +01:00
parent 8b3cac2b3f
commit 2854628258
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
system/extensions/edit.js
View file

@ -816,23 +816,28 @@ yellow.edit = {
// Upload file
uploadFile: function(elementText, file) {
var extension = (file.name.lastIndexOf(".")!=-1 ? file.name.substring(file.name.lastIndexOf("."), file.name.length) : "").toLowerCase();
var extensions = yellow.system.editUploadExtensions.split(/\s*,\s*/);
if (file.size<=yellow.system.coreFileSizeMax && extensions.indexOf(extension)!=-1) {
var text = this.getText("UploadProgress")+"\u200b";
yellow.editor.setMarkdown(elementText, text, "insert");
var thisObject = this;
var formData = new FormData();
formData.append("action", "upload");
formData.append("csrftoken", this.getCookie("csrftoken"));
formData.append("file", file);
var request = new XMLHttpRequest();
request.open("POST", window.location.pathname, true);
request.onload = function() { if (this.status==200) { thisObject.uploadFileDone.call(thisObject, elementText, this.responseText); } else { thisObject.uploadFileError.call(thisObject, elementText, this.responseText); } };
request.send(formData);
if (this.isUserAccess("upload", yellow.page.location)) {
var extension = (file.name.lastIndexOf(".")!=-1 ? file.name.substring(file.name.lastIndexOf("."), file.name.length) : "").toLowerCase();
var extensions = yellow.system.editUploadExtensions.split(/\s*,\s*/);
if (file.size<=yellow.system.coreFileSizeMax && extensions.indexOf(extension)!=-1) {
var text = this.getText("UploadProgress")+"\u200b";
yellow.editor.setMarkdown(elementText, text, "insert");
var thisObject = this;
var formData = new FormData();
formData.append("action", "upload");
formData.append("csrftoken", this.getCookie("csrftoken"));
formData.append("file", file);
var request = new XMLHttpRequest();
request.open("POST", window.location.pathname, true);
request.onload = function() { if (this.status==200) { thisObject.uploadFileDone.call(thisObject, elementText, this.responseText); } else { thisObject.uploadFileError.call(thisObject, elementText, this.responseText); } };
request.send(formData);
} else {
var textError = extensions.indexOf(extension)!=-1 ? "file too big!" : "file format not supported!";
var textNew = "[Can't upload file '"+file.name+"', "+textError+"]";
yellow.editor.setMarkdown(elementText, textNew, "insert");
}
} else {
var textError = extensions.indexOf(extension)!=-1 ? "file too big!" : "file format not supported!";
var textNew = "[Can't upload file '"+file.name+"', "+textError+"]";
var textNew = "[Can't upload file '"+file.name+"', access is restricted!]";
yellow.editor.setMarkdown(elementText, textNew, "insert");
}
},