mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 04:05:57 +00:00
Markdown editor image paste sets cursor correctly
Now sets cursor to alt text rather than end of placeholder image. Fixed #751
This commit is contained in:
parent
b42b07179f
commit
d2eec4fbce
@ -120,7 +120,7 @@ class ImageController extends Controller
|
|||||||
{
|
{
|
||||||
$this->checkPermission('image-create-all');
|
$this->checkPermission('image-create-all');
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'file' => 'is_image'
|
'file' => 'required|is_image'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (!$this->imageRepo->isValidType($type)) {
|
if (!$this->imageRepo->isValidType($type)) {
|
||||||
|
@ -255,7 +255,9 @@ class MarkdownEditor {
|
|||||||
let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
|
let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
|
||||||
let selectedText = cm.getSelection();
|
let selectedText = cm.getSelection();
|
||||||
let placeHolderText = `![${selectedText}](${placeholderImage})`;
|
let placeHolderText = `![${selectedText}](${placeholderImage})`;
|
||||||
|
let cursor = cm.getCursor();
|
||||||
cm.replaceSelection(placeHolderText);
|
cm.replaceSelection(placeHolderText);
|
||||||
|
cm.setCursor({line: cursor.line, ch: cursor.ch + selectedText.length + 2});
|
||||||
|
|
||||||
let remoteFilename = "image-" + Date.now() + "." + ext;
|
let remoteFilename = "image-" + Date.now() + "." + ext;
|
||||||
let formData = new FormData();
|
let formData = new FormData();
|
||||||
@ -264,7 +266,7 @@ class MarkdownEditor {
|
|||||||
window.$http.post('/images/gallery/upload', formData).then(resp => {
|
window.$http.post('/images/gallery/upload', formData).then(resp => {
|
||||||
replaceContent(placeholderImage, resp.data.thumbs.display);
|
replaceContent(placeholderImage, resp.data.thumbs.display);
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
events.emit('error', trans('errors.image_upload_error'));
|
window.$events.emit('error', trans('errors.image_upload_error'));
|
||||||
replaceContent(placeHolderText, selectedText);
|
replaceContent(placeHolderText, selectedText);
|
||||||
console.log(err);
|
console.log(err);
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user