Netsyms/easy-markdown-editor
2
0
Fork 0
mirror of https://github.com/Ionaru/easy-markdown-editor synced 2025-09-24 16:40:55 -06:00
Code Issues Releases Wiki Activity

Merge 68b2ab87a4375dafd6e0baa2394b485f59a21e37 into 95b848a825f900d0bf09c138c0b00a17679bd16f

Browse Source
This commit is contained in:
Michael Chen 2021-02-27 07:49:55 -06:00 committed by GitHub
commit e12caea038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/easymde.js
View File

@ -812,16 +812,9 @@ function afterImageUploaded(editor, url) {
var stat = getState(cm);
var options = editor.options;
var imageName = url.substr(url.lastIndexOf('/') + 1);
var ext = imageName.substring(imageName.lastIndexOf('.') + 1);
// var ext = imageName.substring(imageName.lastIndexOf('.') + 1);
// Check if media is an image
if (['png', 'jpg', 'jpeg', 'gif', 'svg'].includes(ext)) {
_replaceSelection(cm, stat.image, options.insertTexts.uploadedImage, url);
} else {
var text_link = options.insertTexts.link;
text_link[0] = '[' + imageName;
_replaceSelection(cm, stat.link, text_link, url);
}
// show uploaded image filename for 1000ms
editor.updateStatusBar('upload-image', editor.options.imageTexts.sbOnUploaded.replace('#image_name#', imageName));
@ -2320,7 +2313,8 @@ EasyMDE.prototype.uploadImage = function (file, onSuccess, onError) {
// insert CSRF token if provided in config.
if (self.options.imageCSRFToken) {
formData.append('csrfmiddlewaretoken', self.options.imageCSRFToken);
var csrfName = self.options.imageCSRFName || 'csrfmiddlewaretoken';
formData.append(csrfName, self.options.imageCSRFToken);
}
var request = new XMLHttpRequest();
request.upload.onprogress = function (event) {
@ -2339,8 +2333,14 @@ EasyMDE.prototype.uploadImage = function (file, onSuccess, onError) {
onErrorSup(fillErrorMessage(self.options.errorMessages.importError));
return;
}
if (this.status === 200 && response && !response.error && response.data && response.data.filePath) {
onSuccess(window.location.origin + '/' + response.data.filePath);
if ((this.status === 200 || this.status === 201) && response && !response.error && response.data && response.data.filePath) {
var filePath = response.data.filePath;
if (/https?:\/\//i.test(filePath)) {
onSuccess(filePath);
} else {
onSuccess(window.location.origin + '/' + filePath);
}
} else {
if (response.error && response.error in self.options.errorMessages) { // preformatted error message
onErrorSup(fillErrorMessage(self.options.errorMessages[response.error]));