From 5f56c27ba77abc6d9c2b457cb303a2fcbd4da1ed Mon Sep 17 00:00:00 2001
From: Jeroen van Oorschot <j.j.v.oorschot@student.tue.nl>
Date: Tue, 16 Jul 2019 11:01:05 +0200
Subject: [PATCH] update changelog

---
 CHANGELOG.md      | 2 ++
 src/js/easymde.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1775105..c289fc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix status bar update when dragging but not dropping
 - Fix progressbar
 - Add option for CSRF token to include in AJAX call for imageupload
+- Fix status bar reset after upload error
+- Add server side error messages on image upload.
 
 ## [2.7.0] - 2019-07-13
 ### Added
diff --git a/src/js/easymde.js b/src/js/easymde.js
index 05c68aa..3c336d9 100644
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@@ -904,7 +904,7 @@ function _replaceSelection(cm, active, startEnd, url) {
     Object.assign(startPoint, cm.getCursor('start'));
     Object.assign(endPoint, cm.getCursor('end'));
     if (url) {
-        start = start.replace('#url#', url);
+        start = start.replace('#url#', url);  // url is in start for upload-image
         end = end.replace('#url#', url);
     }
     if (active) {