Netsyms/easy-markdown-editor
2
0
Fork 0
mirror of https://github.com/Ionaru/easy-markdown-editor synced 2025-07-26 11:24:39 -06:00
Code Issues Releases Wiki Activity

Show error message in status bar and reset status bar afterwards.

Browse Source
This commit is contained in:
Jeroen van Oorschot 2019-07-15 22:29:11 +02:00
parent d9ee9c43d3
commit 4f581b0c31
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -31,7 +31,7 @@ function scripts() {
return browserify({entries: './src/js/easymde.js', standalone: 'EasyMDE'}).bundle() return browserify({entries: './src/js/easymde.js', standalone: 'EasyMDE'}).bundle()
.pipe(source('easymde.min.js')) .pipe(source('easymde.min.js'))
.pipe(buffer()) .pipe(buffer())
// .pipe(terser()) // TODO enable to minify output .pipe(terser())
.pipe(header(banner, {pkg: pkg})) .pipe(header(banner, {pkg: pkg}))
.pipe(gulp.dest('./dist/')); .pipe(gulp.dest('./dist/'));
} }

26
src/js/easymde.js
View File

@ -1978,7 +1978,19 @@ EasyMDE.prototype.uploadImage = function(file, onSuccess, onError) {
onSuccess = onSuccess || function onSuccess(imageUrl) { onSuccess = onSuccess || function onSuccess(imageUrl) {
afterImageUploaded(self, imageUrl); afterImageUploaded(self, imageUrl);
}; };
onError = onError || self.options.errorCallback; function onErrorSup(errorMessage){
// show error on status bar and reset after 1000ms
self.updateStatusBar('upload-image', errorMessage);
setTimeout(function() {
self.updateStatusBar('upload-image', self.options.imageTexts.sbInit);
}, 1000);
// run custom error handler
if(onError && typeof onError === 'function'){
onError(errorMessage);
}
// run error handler from options, this alerts the message.
self.options.errorCallback(errorMessage);
}
function fillErrorMessage(errorMessage) { function fillErrorMessage(errorMessage) {
var units = self.options.imageTexts.sizeUnits.split(','); var units = self.options.imageTexts.sizeUnits.split(',');
@ -1989,7 +2001,7 @@ EasyMDE.prototype.uploadImage = function(file, onSuccess, onError) {
} }
if (file.size > this.options.imageMaxSize) { if (file.size > this.options.imageMaxSize) {
onError(fillErrorMessage(this.options.errorMessages.fileTooLarge)); onErrorSup(fillErrorMessage(this.options.errorMessages.fileTooLarge));
return; return;
} }
@ -2014,20 +2026,20 @@ EasyMDE.prototype.uploadImage = function(file, onSuccess, onError) {
var response = JSON.parse(this.responseText); var response = JSON.parse(this.responseText);
} catch (error) { } catch (error) {
console.log('EasyMDE: The server did not return a valid json.'); console.log('EasyMDE: The server did not return a valid json.');
onError(fillErrorMessage(self.options.errorMessages.importError)); onErrorSup(fillErrorMessage(self.options.errorMessages.importError));
return; return;
} }
if(this.status === 200 && response && !response.error && response.data && response.data.filePath) { if(this.status === 200 && response && !response.error && response.data && response.data.filePath) {
onSuccess(window.location.origin + '/' + response.data.filePath); onSuccess(window.location.origin + '/' + response.data.filePath);
} else { } else {
if(response.error && response.error in self.options.errorMessages) { // preformatted error message if(response.error && response.error in self.options.errorMessages) { // preformatted error message
onError(fillErrorMessage(self.options.errorMessages[response.error])); onErrorSup(fillErrorMessage(self.options.errorMessages[response.error]));
}else if(response.error){ // server side generated error message }else if(response.error){ // server side generated error message
onError(fillErrorMessage(response.error)); onErrorSup(fillErrorMessage(response.error));
} else { //unknown error } else { //unknown error
console.log('EasyMDE: Received an unexpected response after uploading the image.' console.log('EasyMDE: Received an unexpected response after uploading the image.'
+ this.status + ' (' + this.statusText + ')'); + this.status + ' (' + this.statusText + ')');
onError(fillErrorMessage(self.options.errorMessages.importError)); onErrorSup(fillErrorMessage(self.options.errorMessages.importError));
} }
} }
}; };
@ -2035,7 +2047,7 @@ EasyMDE.prototype.uploadImage = function(file, onSuccess, onError) {
request.onerror = function (event) { request.onerror = function (event) {
console.log('EasyMDE: An unexpected error occurred when trying to upload the image.' console.log('EasyMDE: An unexpected error occurred when trying to upload the image.'
+ event.target.status + ' (' + event.target.statusText + ')'); + event.target.status + ' (' + event.target.statusText + ')');
onError(self.options.errorMessages.importError); onErrorSup(self.options.errorMessages.importError);
}; };
request.send(formData); request.send(formData);