mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-28 13:12:05 +00:00
Set 'uploaded_to' parameters for editor-pasted/dragged images
Allows image-listing permission system to work as intended. Fixes #1287
This commit is contained in:
parent
1c312906bc
commit
d96baf2d4a
@ -8,7 +8,11 @@ class MarkdownEditor {
|
|||||||
|
|
||||||
constructor(elem) {
|
constructor(elem) {
|
||||||
this.elem = elem;
|
this.elem = elem;
|
||||||
this.textDirection = document.getElementById('page-editor').getAttribute('text-direction');
|
|
||||||
|
const pageEditor = document.getElementById('page-editor');
|
||||||
|
this.pageId = pageEditor.getAttribute('page-id');
|
||||||
|
this.textDirection = pageEditor.getAttribute('text-direction');
|
||||||
|
|
||||||
this.markdown = new MarkdownIt({html: true});
|
this.markdown = new MarkdownIt({html: true});
|
||||||
this.markdown.use(mdTasksLists, {label: true});
|
this.markdown.use(mdTasksLists, {label: true});
|
||||||
|
|
||||||
@ -98,7 +102,9 @@ class MarkdownEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
codeMirrorSetup() {
|
codeMirrorSetup() {
|
||||||
let cm = this.cm;
|
const cm = this.cm;
|
||||||
|
const context = this;
|
||||||
|
|
||||||
// Text direction
|
// Text direction
|
||||||
// cm.setOption('direction', this.textDirection);
|
// cm.setOption('direction', this.textDirection);
|
||||||
cm.setOption('direction', 'ltr'); // Will force to remain as ltr for now due to issues when HTML is in editor.
|
cm.setOption('direction', 'ltr'); // Will force to remain as ltr for now due to issues when HTML is in editor.
|
||||||
@ -266,17 +272,18 @@ class MarkdownEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Insert image into markdown
|
// Insert image into markdown
|
||||||
let id = "image-" + Math.random().toString(16).slice(2);
|
const id = "image-" + Math.random().toString(16).slice(2);
|
||||||
let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
|
const placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
|
||||||
let selectedText = cm.getSelection();
|
const selectedText = cm.getSelection();
|
||||||
let placeHolderText = `![${selectedText}](${placeholderImage})`;
|
const placeHolderText = `![${selectedText}](${placeholderImage})`;
|
||||||
let cursor = cm.getCursor();
|
const cursor = cm.getCursor();
|
||||||
cm.replaceSelection(placeHolderText);
|
cm.replaceSelection(placeHolderText);
|
||||||
cm.setCursor({line: cursor.line, ch: cursor.ch + selectedText.length + 3});
|
cm.setCursor({line: cursor.line, ch: cursor.ch + selectedText.length + 3});
|
||||||
|
|
||||||
let remoteFilename = "image-" + Date.now() + "." + ext;
|
const remoteFilename = "image-" + Date.now() + "." + ext;
|
||||||
let formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append('file', file, remoteFilename);
|
formData.append('file', file, remoteFilename);
|
||||||
|
formData.append('uploaded_to', context.pageId);
|
||||||
|
|
||||||
window.$http.post('/images/gallery/upload', formData).then(resp => {
|
window.$http.post('/images/gallery/upload', formData).then(resp => {
|
||||||
const newContent = `[![${selectedText}](${resp.data.thumbs.display})](${resp.data.url})`;
|
const newContent = `[![${selectedText}](${resp.data.thumbs.display})](${resp.data.url})`;
|
||||||
@ -302,7 +309,7 @@ class MarkdownEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
actionInsertImage() {
|
actionInsertImage() {
|
||||||
let cursorPos = this.cm.getCursor('from');
|
const cursorPos = this.cm.getCursor('from');
|
||||||
window.ImageManager.show(image => {
|
window.ImageManager.show(image => {
|
||||||
let selectedText = this.cm.getSelection();
|
let selectedText = this.cm.getSelection();
|
||||||
let newText = "[![" + (selectedText || image.name) + "](" + image.thumbs.display + ")](" + image.url + ")";
|
let newText = "[![" + (selectedText || image.name) + "](" + image.thumbs.display + ")](" + image.url + ")";
|
||||||
@ -313,7 +320,7 @@ class MarkdownEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
actionShowImageManager() {
|
actionShowImageManager() {
|
||||||
let cursorPos = this.cm.getCursor('from');
|
const cursorPos = this.cm.getCursor('from');
|
||||||
window.ImageManager.show(image => {
|
window.ImageManager.show(image => {
|
||||||
this.insertDrawing(image, cursorPos);
|
this.insertDrawing(image, cursorPos);
|
||||||
}, 'drawio');
|
}, 'drawio');
|
||||||
@ -321,7 +328,7 @@ class MarkdownEditor {
|
|||||||
|
|
||||||
// Show the popup link selector and insert a link when finished
|
// Show the popup link selector and insert a link when finished
|
||||||
actionShowLinkSelector() {
|
actionShowLinkSelector() {
|
||||||
let cursorPos = this.cm.getCursor('from');
|
const cursorPos = this.cm.getCursor('from');
|
||||||
window.EntitySelectorPopup.show(entity => {
|
window.EntitySelectorPopup.show(entity => {
|
||||||
let selectedText = this.cm.getSelection() || entity.name;
|
let selectedText = this.cm.getSelection() || entity.name;
|
||||||
let newText = `[${selectedText}](${entity.link})`;
|
let newText = `[${selectedText}](${entity.link})`;
|
||||||
@ -357,7 +364,7 @@ class MarkdownEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
insertDrawing(image, originalCursor) {
|
insertDrawing(image, originalCursor) {
|
||||||
let newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
|
const newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
|
||||||
this.cm.focus();
|
this.cm.focus();
|
||||||
this.cm.replaceSelection(newText);
|
this.cm.replaceSelection(newText);
|
||||||
this.cm.setCursor(originalCursor.line, originalCursor.ch + newText.length);
|
this.cm.setCursor(originalCursor.line, originalCursor.ch + newText.length);
|
||||||
@ -365,9 +372,13 @@ class MarkdownEditor {
|
|||||||
|
|
||||||
// Show draw.io if enabled and handle save.
|
// Show draw.io if enabled and handle save.
|
||||||
actionEditDrawing(imgContainer) {
|
actionEditDrawing(imgContainer) {
|
||||||
if (document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true') return;
|
const drawingDisabled = document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true';
|
||||||
let cursorPos = this.cm.getCursor('from');
|
if (drawingDisabled) {
|
||||||
let drawingId = imgContainer.getAttribute('drawio-diagram');
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cursorPos = this.cm.getCursor('from');
|
||||||
|
const drawingId = imgContainer.getAttribute('drawio-diagram');
|
||||||
|
|
||||||
DrawIO.show(() => {
|
DrawIO.show(() => {
|
||||||
return window.$http.get(window.baseUrl(`/images/base64/${drawingId}`)).then(resp => {
|
return window.$http.get(window.baseUrl(`/images/base64/${drawingId}`)).then(resp => {
|
||||||
|
@ -4,22 +4,24 @@ import DrawIO from "../services/drawio";
|
|||||||
/**
|
/**
|
||||||
* Handle pasting images from clipboard.
|
* Handle pasting images from clipboard.
|
||||||
* @param {ClipboardEvent} event
|
* @param {ClipboardEvent} event
|
||||||
|
* @param {WysiwygEditor} wysiwygComponent
|
||||||
* @param editor
|
* @param editor
|
||||||
*/
|
*/
|
||||||
function editorPaste(event, editor) {
|
function editorPaste(event, editor, wysiwygComponent) {
|
||||||
if (!event.clipboardData || !event.clipboardData.items) return;
|
if (!event.clipboardData || !event.clipboardData.items) return;
|
||||||
let items = event.clipboardData.items;
|
|
||||||
|
|
||||||
for (let i = 0; i < items.length; i++) {
|
for (let clipboardItem of event.clipboardData.items) {
|
||||||
if (items[i].type.indexOf("image") === -1) continue;
|
if (clipboardItem.type.indexOf("image") === -1) continue;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
let id = "image-" + Math.random().toString(16).slice(2);
|
const id = "image-" + Math.random().toString(16).slice(2);
|
||||||
let loadingImage = window.baseUrl('/loading.gif');
|
const loadingImage = window.baseUrl('/loading.gif');
|
||||||
let file = items[i].getAsFile();
|
const file = clipboardItem.getAsFile();
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
editor.insertContent(`<p><img src="${loadingImage}" id="${id}"></p>`);
|
editor.insertContent(`<p><img src="${loadingImage}" id="${id}"></p>`);
|
||||||
uploadImageFile(file).then(resp => {
|
|
||||||
|
uploadImageFile(file, wysiwygComponent).then(resp => {
|
||||||
editor.dom.setAttrib(id, 'src', resp.thumbs.display);
|
editor.dom.setAttrib(id, 'src', resp.thumbs.display);
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
editor.dom.remove(id);
|
editor.dom.remove(id);
|
||||||
@ -33,9 +35,12 @@ function editorPaste(event, editor) {
|
|||||||
/**
|
/**
|
||||||
* Upload an image file to the server
|
* Upload an image file to the server
|
||||||
* @param {File} file
|
* @param {File} file
|
||||||
|
* @param {WysiwygEditor} wysiwygComponent
|
||||||
*/
|
*/
|
||||||
function uploadImageFile(file) {
|
async function uploadImageFile(file, wysiwygComponent) {
|
||||||
if (file === null || file.type.indexOf('image') !== 0) return Promise.reject(`Not an image file`);
|
if (file === null || file.type.indexOf('image') !== 0) {
|
||||||
|
throw new Error(`Not an image file`);
|
||||||
|
}
|
||||||
|
|
||||||
let ext = 'png';
|
let ext = 'png';
|
||||||
if (file.name) {
|
if (file.name) {
|
||||||
@ -43,11 +48,13 @@ function uploadImageFile(file) {
|
|||||||
if (fileNameMatches.length > 1) ext = fileNameMatches[1];
|
if (fileNameMatches.length > 1) ext = fileNameMatches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
let remoteFilename = "image-" + Date.now() + "." + ext;
|
const remoteFilename = "image-" + Date.now() + "." + ext;
|
||||||
let formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append('file', file, remoteFilename);
|
formData.append('file', file, remoteFilename);
|
||||||
|
formData.append('uploaded_to', wysiwygComponent.pageId);
|
||||||
|
|
||||||
return window.$http.post(window.baseUrl('/images/gallery/upload'), formData).then(resp => (resp.data));
|
const resp = await window.$http.post(window.baseUrl('/images/gallery/upload'), formData);
|
||||||
|
return resp.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
function registerEditorShortcuts(editor) {
|
function registerEditorShortcuts(editor) {
|
||||||
@ -370,7 +377,10 @@ class WysiwygEditor {
|
|||||||
|
|
||||||
constructor(elem) {
|
constructor(elem) {
|
||||||
this.elem = elem;
|
this.elem = elem;
|
||||||
this.textDirection = document.getElementById('page-editor').getAttribute('text-direction');
|
|
||||||
|
const pageEditor = document.getElementById('page-editor');
|
||||||
|
this.pageId = pageEditor.getAttribute('page-id');
|
||||||
|
this.textDirection = pageEditor.getAttribute('text-direction');
|
||||||
|
|
||||||
this.plugins = "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists codeeditor media";
|
this.plugins = "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists codeeditor media";
|
||||||
this.loadPlugins();
|
this.loadPlugins();
|
||||||
@ -397,6 +407,9 @@ class WysiwygEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getTinyMceConfig() {
|
getTinyMceConfig() {
|
||||||
|
|
||||||
|
const context = this;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
selector: '#html-editor',
|
selector: '#html-editor',
|
||||||
content_css: [
|
content_css: [
|
||||||
@ -586,7 +599,7 @@ class WysiwygEditor {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Paste image-uploads
|
// Paste image-uploads
|
||||||
editor.on('paste', event => editorPaste(event, editor));
|
editor.on('paste', event => editorPaste(event, editor, context));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user